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.

Backed our new styles out of ink.css and moved them into style.css. Small margin tweaks, looking good to go.

fix test connection bug

Added in additional text and incorporated the bulletproof button that was built for raintank. Needs some help from Torkel or Nick to make sure it's cleaner

don't calculate cumulative value if series overrides stack to false

Conflicts:
	docs/sources/installation/debian.md
	docs/sources/installation/ldap.md

feat(admin): Deleting org from orgs list now works, will permanently delete dashboards, data sources, etc, closes #2457