sdfsdfds
Finish Hotfix-1

Conflicts:
	app/controllers/application_controller.rb
Finish Release-7