Merge pull request #52 from capms/curley

Curley
Add requirements to modals
Merge branch 'master' into profilepage

requirements for modals
Merge pull request #53 from capms/profilepage

Profilepage
changed navbar-new to badges
Merge branch 'master' into curley