fixed comments from Andrew
Merge branch 'rails4' of https://github.com/kschneider3/expertiza into rails4

Conflicts:
	app/controllers/submitted_content_controller.rb
fixing files which Andrew commented on