Renaming Views to DataGroupings
Rename observationtypes to categories
Clean up migrations
Clean up migrations
Template bug fixes
Merge branch 'rename' into staging