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

Conflicts:
	src/app/features/opentsdb/datasource.js

Merge branch 'tsdb_downsample' of https://github.com/frogmaster/grafana into frogmaster-tsdb_downsample

Increased max user list to 1000 for user admin page, need to paging, but will have to wait a few days

Import views are now consolidated into one view, and found through one navigation (dashboard search -> Import, Closes #1511

typo fixes, .gitignore tweak