flight page
ajax loading hotel list
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/apps/hotel/templates/hotel/website/hotel.list.html
	src/apps/hotel/website/views.py