Merge branch 'hotfix/1.0.1'
push for codeship
push for codeship
Merge branch 'release/1.1'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
removing PriceTravel credentials, writing credentials encoded yet
removing proxy, isn't necessary for releases
removing Gemfile.lock
Merge branch 'hotfix/removing_secrets' into develop