Fix missing route config for devise
Merge branch 'master' into password-recovery

* master:
  Fix missing route config for devise

Conflicts:
	config/routes.rb