Editing dropdown links on the navbar and bugs of the navbar fixed with Bootstrap. Modifications on profile page
Merge branch 'master' into Settings

Conflicts:
	css/style.css
Merge branch 'Settings'