ffffeeee
Merge https://github.com/dreamcpp/test into integration

Conflicts:
	app/controllers/home_controllers.rb