Upgrade Rails version
Upgrade gems
Merge branch 'master' into rm-bootstrap-3

Conflicts:
	Gemfile.lock