commit
Merge https://github.com/tarpitgrover/Misconnex

Conflicts:
	Misconnex/Misconnex.Web/WebApp/management/management-hotel-editor.html
commit
commit