query, hogan, dashboard added
Merge branch 'matt'