Merge.
Merge branch 'master' of https://github.com/Usernamealreadynottaken/Messiah

Conflicts:
	Hotel/admin.pyc
	Hotel/models.pyc
	Hotel/urls_admin.pyc
	Hotel/views.pyc
	Messiah/settings.pyc