Merge branch 'release/0.7.1' into dev
Merge branch 'hotfix/0.7.2' into dev
Merge remote-tracking branch 'origin/dev' into dev
Add a base template for user pages, one with no search