upgraded rails to 4 WCMS-61
fixed problems .id returning a BSON::ObjectId instead of a string and added strong params support
Need to add an initializer to customize the BSON::ObjectId.as_json() method. This fixes error we were getting between mongoid 4 and the way we are indexing models into elastic search.
Gemfile.lock should be pointing to github, not local repository.
Merge branch 'Rails4Upgrade'

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/actors_controller.rb
	app/controllers/department_contacts_controller.rb
	app/controllers/departments_controller.rb
	app/controllers/people_controller.rb
	app/views/shared/_contacts_tab.html.slim
Merge branch 'master' of github.com:biola/profile-publisher

Conflicts:
	app/views/shared/_members_tab.html.slim