Merge remote-tracking branch 'origin/master' into gh-pages
Merge branch 'gh-pages' of https://github.com/trustyou/example-search-results-hotel-type into gh-pages