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

Conflicts:
	Misconnex/Misconnex.Web/WebApp/common/misconnex.common.js
	Misconnex/Misconnex.Web/WebApp/management/management-airline-editor.html
	Misconnex/Misconnex.Web/WebApp/management/management-airlines-table.html
	Misconnex/Misconnex.Web/WebApp/management/management-hotels-table.html
	Misconnex/Misconnex.Web/WebApp/management/misconnex.management.js