modified gem lock
Merge branch 'master' into model

Conflicts:
	Gemfile.lock