Merge remote-tracking branch 'origin/master'

Conflicts:
	src/css/bootstrap.dark.min.css
	src/css/bootstrap.light.min.css
	src/css/less/grafana.less
	src/css/less/variables.dark.less
	src/css/less/variables.light.less