Merge branch 'bborn' into rails4

Conflicts mainly due to Rails4 attr_accessible and Strong Parameters.

Conflicts:
	app/controllers/comments_controller.rb
	app/controllers/posts_controller.rb
	app/models/category.rb
	app/models/photo.rb
	community_engine.gemspec
	lib/community_engine/version.rb