Merge branch 'global_interval' of https://github.com/felixbarny/grafana into felixbarny-global_interval

Conflicts:
	public/app/plugins/datasource/elasticsearch/partials/config.html

add pencil icon back to graphite data source

fixes #3360
closes #3361

I find it easier to follow and checkdate didnt do much.

Add cubic meters to units

Revert "(cloudwatch) add "Divide Sum By Period" option"

(cloudwatch) add "Divide Sum By Period" option

Fixed typos

closes #1163

Merge branch 'feature/symlinks' of https://github.com/jmaitrehenry/grafana into jmaitrehenry-feature/symlinks

Conflicts:
	pkg/plugins/plugins.go

closes #2899
closes #2834

(cloudwatch) fix query editor

Added metadata info panel

fixes #2379

Wait for all panels to render in PhantomJS

(cloudwatch) annotation support

cleanup(KairosDB): removed kairosdb from main repo, can easily be installed via as plugin via its own plugin repo, https://github.com/grafana/datasource-plugin-kairosdb, closes #3524

cleanup(influxdb_08): removed influxdb 0.8 data source as an built in official data source, moved it to an external plugin repo, https://github.com/grafana/datasource-plugin-influxdb-08,  closes #3523

closes #966