deploying rails 4
fixes
fixes
fixes
fixes
Hell fuck yeah
Hell fuck yeah
Hell fuck yeah
Hell fuck yeah
Merge branch 'master' into deploy

Conflicts:
	app/controllers/shifts_controller.rb
Delete wrong shift controller
Merge branch 'master' into deploy
At last