Syed made some quick changes to front end
Merge branch 'master' of github.com:clemensp/majordomo

Conflicts:
	app/views/home/index.html.erb
	app/views/shared/_navigation.html.erb