lots of stuff

Committing all my code before merge.
Merge branch 'master' into driley

Conflicts:
	js/mtsContextManager.js
Merge branch 'driley' into RSherman_LEX

Conflicts:
	js/mtsInventory.js