Revert "Revert 335c54e..7c42a16"

This reverts commit cc6cb1f99633a9a7b9ef1da375961c6b623806bf.

Conflicts:
	Gemfile.lock
	config/routes.rb