test
Merge branch 'master' of https://github.com/ehbhotel/ehbhotel

Conflicts:
	ehbhotel/ehbhotel/settings.py
test
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Kiosk website