Added user profile page
Merge branch 'user-profile-page' into develop