Conflicts:
	CHANGELOG.md

fix(templating): Another atempt at fixing #2534 (Init multi value template var used in repeat panel from url), fixes #2564

Conflicts:
	CHANGELOG.md

fix(packaging): deb & rpm package did not mark ldap.toml config file as a configuration file, 2.1.1 & 2.1.2 upgrade overwrote it :(,  fixes #2580

feat(relative time override): You can now use the new relative time option  in panel time override, closes #2575

feat(panel resize): Resize handles in panel bottom right corners for easy width and height change, closes #2577

Conflicts:
	public/app/features/panel/panelDirective.js

fix(templating): Another atempt at fixing #2534 (Init multi value template var used in repeat panel from url), fixes #2564

fix(annotations): Fixed issue when html sanitizer failes for title to annotation body, now fallbacks to html escaping title and text, fixes #2563

fix(snapshot): Fix for snapshot with expire 7 days option, 7 days option not correct, was 7 hours, fixes #2574

fix(TimePicker): Fix for when you applied custom time range it did not refreh dashboard, fixes #2565

Conflicts:
	CHANGELOG.md
	package.json

fix(timepicker): fixed for viewing auto refresh submenu when timpicker selection is set to Today, fixes #2552

Disable load timeout in requirejs

fix(user create): fixed for creating multiple users with empty email when auto assign org is set to false, fixes #2011

fix(type ahead): fixed highlight, and made the highlight more distinct, also rolled back #2436 due to its issues on linux and windows, fixes #2527

Conflicts:
	CHANGELOG.md

feat(mixed datasource): fixing varios issues with the query editor changes, updated kariosdb data source editor to work with the new model,  #436

feat(mixed data source queries): lots of minor polish to new mixed data source and all the changes it has required, #436

Conflicts:
	CHANGELOG.md