Minor cosmetic changes
Merge branch 'master'

Conflicts:
	app/controllers/card_controller.rb
	app/controllers/requests_controller.rb