Organization: You can now update the organization user role directly (without removing and readding the organization user). Closes #1899

Final polish on panel & row repeats, #1888, still some missing places where scopedVars needs to be used

Templating: Support for search filtering and keyboard up/down filtering in the new multi variable value selector dropdown, #1144

Fix the first CLA link.

Conflicts:
	conf/sample.ini

Fixed XSS issue with file based dashboards, was really casued by an issue with alertSrv accepting html in message alerts

Conflicts:
	public/app/features/templating/templateValuesSrv.js

add gigabytes as unit

Fixed Annotations with InfluxDb9 Datasources

Updated 2.0 docs, merged with master and removed docs for features in 2.1, doc updates related to 2.0 needs to be done to this branch

Correct deb version number in install guide.

Added message alerts when login failed due to github team membership or email domain requirement, #1731, #1660

Merge branch 'github-team-membership-requirement' of https://github.com/dewski/grafana into dewski-github-team-membership-requirement

Conflicts:
	pkg/api/dtos/models.go