Fix template dir
Merge with master:
Adds app for users; adding base models
Merge branch 'master' into stub-styles