Conflicts:
	src/css/less/sidemenu.less

More work on restoring features after moving to plugin model for datasources, no annotations work again #1276 #1472

A lot of work on backend plugin model for frontend components, right now for data sources, will enable dropin plugins for data sources and panels, #1472

further cleanup of styles to make sidebar more readable for light theme. This tweaked link colors, dropdown colors and table tweaks for things like Add API to make them feel a little more organized through shades of gray.

CSS tweaks to link styles for sidebar, nav bar, search pane. Also the nav bar height seemed off from the sidebar, so made that consistent. Variables were created when colors were hard-coded for both dark and light. This meant that both variables.light.less and variables.dark.less were updated.

New implementation for API Keys that only stores hashed api keys, and the client key is base64 decoded json web token with the unhashed key, Closes #1440

Conflicts:
	pkg/api/apikey.go
	pkg/services/sqlstore/migrations.go

Added permissions section to admin > edit user view, an admin can now make another user admin, Closes #1517

Made a copy of influxdb datasource named influxdb_08 so the main influxdb data source can be modified to support InfluxDB 0.9, made some initial experiments to get queries to work, but a lot more work is needed, #1525

Merge branch 'fixDashboardDelete' of https://github.com/raintank/grafana into raintank-fixDashboardDelete

Conflicts:
	pkg/services/sqlstore/dashboard.go