Merge branch 'release/0.0.15'
Merge branch 'release/0.0.16'
Fix faulty layout on users/show
Merge branch 'hotfix/0.0.16a' into develop