Merge master to developer -JPittmanFix
Merge branch 'JPittmanFix' of https://github.com/itraycer/iTraycer into developer

Conflicts:
	index.html
Merge from developerfix to jpittmanfix -JEuvin
Fixed merge issues from Johns branch -JEuvin
allocation: partial commit for ajax call to save inventory
Merge branch 'JPittmanFix' of https://github.com/itraycer/iTraycer into developer

Conflicts:
	js/mtsContextManager.js
Merge branch 'jpittman' of https://github.com/itraycer/iTraycer into developer

Conflicts:
	js/mtsAllocation.js