Removed no-login page-breaking bug
Merge branch 'humanity_united' of https://github.com/itpir/adt into humanity_united

Conflicts:
	app/controllers/static_pages_controller.rb