Updated code - cleaning unused lines
Updated code - cleaning unused lines
Updated gemfile
Updated gemfile#2
Gemfile update #3
Merge branch 'master' into FeatureXY

Conflicts:
	Gemfile
Gemfile update #4