häää?
Merge remote-tracking branch 'origin/model_controller_coordination' into model_controller_coordination

Conflicts:
	app/controllers/actor_controller.rb