adds basic authentication
 Merge branch 'master' of github.com:clemensp/majordomo

Conflicts:
	app/views/shared/_navigation.html.erb
	db/schema.rb