Conflicts:
	pkg/models/datasource.go
	public/app/plugins/datasource/prometheus/datasource.js
	public/app/plugins/datasource/prometheus/partials/query.editor.html
	public/app/plugins/datasource/prometheus/queryCtrl.js

small docs structure change, moved build from source into install section and CLA into project, and about into project

fix prometheus time conversion

Add config option to strip (most) colors from console logs

fix unmatched tag

Fix "Link to Prometheus" button for proxied Prometheus sources.

add graphite multiplySeries function

Prometheus fixes

Further Prometheus unit tests

Prometheus docs & better template queries

Add Prometheus datasource

Missing carriage return in init script when displaying usage

fix(phantomjs binary): fixed PR #2832 so that it works on linux, now phantomjs based server side rendershould work on mac and linux, maybe even windows