Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go
	public/app/core/components/grafana_app.ts
	public/app/core/core.ts
	public/app/features/dashboard/dashboardCtrl.js

feat(graph): graph tooltip sort order PR refactored/changed #4944, changed the layout graph display options, #4944

Implemented nested template variables functionality for Opentsdb

Due to a bug in golang the 64bit variable i
need to come first to be 64bit aligned.
https://golang.org/pkg/sync/atomic/#pkg-note-BUG

closes #5341

update pricing to include 1 million free API requests per month

Conflicts:
	public/app/plugins/datasource/influxdb/query_part.ts

feat(prometheus): restore old prometheus query editor, revert this commit in prometheus query editor v2 branch

Enable the "limit" param in /api/search

Conflicts:
	CHANGELOG.md

Commit adds a check whether Organization exists before User is added to
the organization.

Fixes #3151.