Merge remote-tracking branch 'upstream/develop' into develop
Clean up the profile page
Merge pull request #71 from Icarurs/develop

Clean up the profile page view