Merge pull request #53 from capms/profilepage

Profilepage
changed navbar-new to badges
Merge branch 'master' into curley
Merge pull request #54 from capms/curley

Curley
final changes to modal
Merge branch 'master' into profilepage

mergeing with master