Merge branch 'master' of https://github.com/itraycer/iTraycer into jhargrave

Conflicts:
	js/mtsContextManager.js

typo fix