upgrade rails to 4.2.0
remove gemset
renamed gemset
Merge pull request #1 from RacoonsGroup/AN-upgrade-to-rails-4.2.0

upgrade rails to 4.2.0
Merge branch 'master' into GS-pivotal-integration

Conflicts:
	Gemfile.lock
Gemfile.lock fixed