Update gems
Update gems
Merge branch 'develop'

Conflicts:
	Gemfile.lock