Adds dropdownmenu.
Adds dropdownmenu.
Adds dropdownmenu.
Merge origin/master

Conflicts:
	app/index.html
	app/styles/main.css
	app/views/main.html