Updated UI layout: Navbar + other
Merge branch 'master' of https://github.com/mbdietrich/MUCapstone2013_Team2.git