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

Conflicts:
	Hotel/static/Hotel/admin/base.less