Revert "end of 14"

This reverts commit 7ca154fcdc6fb4f26c4ad24c0dedf8ce28875900.

Conflicts:
	app/controllers/application_controller.rb
"end of 14"

This reverts commit 7ca154fcdc6fb4f26c4ad24c0dedf8ce28875900.

Conflicts:
	app/controllers/application_controller.rb