Updates gems
Merge branch 'master' into push-karma-inbox-140

Conflicts:
	Gemfile.lock