fix routes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/routes.rb