Merge branch 'master' into develop
Add redirect to profile page form user view
Merge branch 'develop'