Update gems
Update the version of Rails to fix vulnerability CVE-2014-0082. Thanks, Rails security group @ https://groups.google.com/forum/#!forum
Merge branch 'rails_security_update_for_vulnerability'
Merge branch 'master' into development-oauth

Conflicts:
	Gemfile.lock