Conflicts:
	README.md

Graph & Singlestat: Support for additional units, Fahrenheit (°F) and Celsius (°C), Humidity (%H), kW, watt-hour (Wh), kilowatt-hour (kWh), velocities (m/s, km/h, mpg, knot), Closes #1366

Graph: Shared tooltip improvement, can now support metrics of different resolution/intervals, Closes #978, Fixes #1499

Worked on submenu row (templating, annotations), removed templating and annotation feature toggles, the submenu row will be visible as soon as there are any template vars or annotations, #1503

Close dashboard edit views when clicking on dashboard title, added some tooltips to dashboard top nav

Refresh frontend datasourceSrv after datasource update, no longer need to reload the page to use a newly added or updated datasource, #1493

Force full reload when switching account, temp fix for refreshing frontend datasource, settings, and user account role

Added validation for correct timespans when using panel timeshift or relative time override, Fixes #1494

Removed use of absolute urls in dashboard search and dashlist, root_url option is now not required, it is required if you use oauth or proxy grafana under suburl, #1483

Fixed dashboard search dropdown issue where it closes dashboard settings view if open, also fixed so that clicking outside dashboard search will close it, Fixes #1489

Passing --config had no effect when passed.  It will now be applied as
the last config file and before any env var overrrides.

More consistent w/ other commands and separates stdout/stderr

Follows the same convention as other commands.

More consistent w/ other command names.

Allows creating a datasource from the command line

Describes the full datasource details given an account and
datasource name.

Lists all the datasources for an account via the CLI