Cut and paste error
Merge branch 'improve_action_logging' into isolate_api_behavior_from_base_controller

Conflicts:
	controller/app/controllers/base_controller.rb