updating gemfile again
Updating gemfile from master
Merge branch 'develop'

* develop:
  updating gemfile again

Conflicts:
	Gemfile
fix conflicts