final changes to modal
Merge branch 'master' into profilepage

mergeing with master
Merge pull request #55 from capms/profilepage

Profilepage