Merge branch 'hotfix/0.0.16a'
Merge branch 'release/0.0.17'
Fix problem displaying user show page after profile edit
Merge branch 'hotfix/0.0.17a' into develop