user profile
Merge branch 'develop' of https://github.com/ajency/BenSmiley into develop
ui bugs fixed