Merge branch 'updated-list-views' of https://github.com/nchristus/grafana into nchristus-updated-list-views
