Fixed mistakes left from previous commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/fine_print/contracts_controller.rb