Merge branch 'feature/making_the_order' into develop

Conflicts:
	app/views/spree/hotels/_cart_form.html.erb
Merge pull request #2 from openjaf/develop

Develop
fixing path for heroku
Merge pull request #3 from openjaf/master

merging to develop
updates for heroku
more fix for heroku
putting google place js in a rails way
fixing some js for google place in the admon interface
setting a rails way the location show view
setting a rails way the location show view
setting a rails way the location show view
setting a rails way the location show view
no Cart step, the checkout starts when click the add to cart bottom, Delivery Step removed
Merge pull request #4 from openjaf/develop

no Cart step, the checkout starts when click the add to cart bottom, Del...
new step in the checkout proces for contact of customers for each room
searcher in the search box with arrival and departure date
Merge pull request #5 from openjaf/develop

Develop
push to codeship
updaloading schema.rb
updaloading schema.rb