Model-driven views
Merge branch 'master' of github.com:the-grid/the-graph