Updated gemfile#1
Merge branch 'master' into FeatureXY

Conflicts:
	Gemfile