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

fix(templating): fix for setting template variable value via url and having repeated panels or rows, fixes #2534

Email tweaks

Fixing permission issues for new installations

close all existing loggers before re-initializing loggers. fixes #2533

The umask as 0027 will generates permissions like:
0640 - for files
0750 - for directories

This should solve the grafana.db being accesable by any user for new installations.