Conflicts:
	pkg/api/api.go

Conflicts:
	conf/defaults.ini
	main.go
	pkg/services/sqlstore/migrations/migrations.go

Fix dataproxy_test.go tests

This change fix dataproxy_test.go tests that was failing with:

pkg/api/dataproxy_test.go:17: not enough arguments in call to NewReverseProxy
pkg/api/dataproxy_test.go:39: not enough arguments in call to NewReverseProxy
FAIL	_/home/ubuntu/grafana/pkg/api [build failed]

Update docstring for postgres session provider

The postgres provider is named postgres and not postgresql. For somebody
configuring the server from the config file example, it is very easy to
write an invalid value into the file and accidentally use the "memory"
provider instead because of a typo.

feat(influxdb): more work on changing the influxdb editor to support better aliasing and interval options, #2647, #2599

feat(influxdb): began work on changing the influxdb editor to support better aliasing and interval options, #2647, #2599

Fix typo

feat(annotations): polished up the annotation editor tabs, similar to recent commits for templating editor

fix(templating): updated templating UI and tab behavior, now edit tab is not visible when not actually editing an existing var, fixes #2679

feat(organization): added update org address to http api and to org details settings view, closes #2672

fix(api): Added error handling to create and update org http apis and sql update handlers, now checks for org name taken scenarios and returns correct http error code and message, fixes #2686

fix(elasticsearch): fixed series naming & aliasing when using field for extended_stats and percentiles

Conflicts:
	public/app/plugins/datasource/influxdb/queryCtrl.js

feat(elasticsearch): metric response handling and processsing now supports alias patterns, {{term field name}} and {{metric}} now works, #1034

feat(elasticsearch): extended stats like std deviation now works, and sigma option as well, added unique count (cardinality as well, #1034

feat(elastic_ds): moving time field name to dataasource option, it is no longer specified for each query and date_histogram