Update gems
Update rails version and gems
Merge branch 'develop'

Conflicts:
	Gemfile.lock