updating mongoid gem
Merge branch 'master' into trello_effort_app

Conflicts:
	Gemfile.lock