Crafted the test_app
Merge branch '2-3-stable' into 2-4-stable

Conflicts:
	spree_travel_hotel.gemspec
Merge branch '2-4-stable'