finalised profile page
Merge branch 'profile' into development