Merge from developerfix to jpittmanfix -JEuvin
Merge branch 'JPittmanFix' of https://github.com/itraycer/iTraycer into DeveloperFix

Conflicts:
	js/mtsAllocation.js
Fixed missing line in context manager -JEuvin
Merge branch 'DeveloperFix' of https://github.com/itraycer/iTraycer into DeveloperFix

Conflicts:
	js/mtsAllocation.js