MD-22
Merge remote-tracking branch 'origin/master' into Routes_fixes

Conflicts:
	config/routes.rb
	spec/controllers/minds_controller_spec.rb
changed comments routes