Merge branch 'hotfix/1.3.2' into develop
adding proxy
adding css
adding images and javascripts
deleting app/temporal
keeping spree_application.html.erb identical to origin
updating _header.html.erb and _footer.html.erb
rendering home/index.html.erb with spree_application.html.erb as layout, identical to the original design.
rendering layout on products_controller_decorator.rb
rendering old_index.html.erb with layout
removing header a footer from index.html.erb
updating hotels/index.html.erb
updating hotels/index.html.erb
updating hotels/index.html.erb
incrementing input date width
improving spree_application.html.erb
updating flights/index.html.erb
updating flights/index.html.erb
updating flights/index.html.erb
Merge branch 'feature/adding_views' into develop