Merge branch 'RSherman_LEX'

Conflicts:
	js/mtsContextManager.js
Riley-Pittman-Euvin Merged

Fixes UI bugs in Inventory Manager
Stabilize Jose's UI for Billing Confirmation
Fixes Merge bug - element id collision with Jose

fixes minor UI bug from merge with Jose
Merge branch 'master' of https://github.com/itraycer/iTraycer into jeuvin

Conflicts:
	index.html