Merge branch 'master' into cleanup

Conflicts:
	Gemfile
	app/controllers/comments_controller.rb
	app/controllers/reviews_controller.rb
	app/controllers/views_controller.rb