Landing page design, hotel page route fix
Merge branch 'master' of github.com:cloice/cloice

Conflicts:
	client/router.js