first commit
primer commit
arreglando el gemfile
Merge branch 'master' of https://github.com/openjaf/spree_travel_tour

Conflicts:
	Gemfile
	spree_travel_tour.gemspec
Modified Gemfile to configurate local and remote enviroment
arreglando el gemfile
added snc local configuration to Gemfile
only one line for const CONFIGURATION
added local config by raul into Gemfile
arreglando el gemfile
Merge branch 'master' of https://github.com/openjaf/spree_travel_tour

Conflicts:
	Gemfile
modified Gemfile changed gem spree_travel by spree_travel_core
modified gemspec
modified Rakefile
sustitude tour by activity
sustituded tour by activity
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	Gemfile
	README.md
	Rakefile
	config/locales/en.yml
	config/routes.rb
	script/rails
	spec/spec_helper.rb