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.

Conflicts:
	pkg/services/sqlstore/migrations/migrations_test.go

Conflicts:
	pkg/api/api.go
	pkg/setting/setting.go