small fixes
Merge branch 'master' of github.com:torkelo/grafana

Conflicts:
	src/app/panels/graphite/module.html