modified:   config/routes.rb
Merge branch 'master' into Auth

Conflicts:
	config/routes.rb

	modified:   config/routes.rb
	modified:   config/routes.rb