branched
Merge branch 'master' of https://github.com/philsmith86/GTR into ST_DEV_BRANCH

Conflicts:
	main.lua
Work complete
so much todo
Merge branch 'master' of https://github.com/philsmith86/GTR into ST_DEV_BRANCH

Conflicts:
	main.lua
Final changes