updated
Merge branch 'master' of github.com:torkelo/grafana_dev