change routing and redirects
Merge branch 'routing' into dev

Conflicts:
	app/models/user.rb
no commit