arreglando el gemgile
Merge branch 'master' of https://github.com/openjaf/spree_travel_destination

Conflicts:
	Gemfile