bla
Merge branch 'andremshilipack'

Conflicts:
	app/controllers/application_controller.rb
a