Commit for working on pc
Merge branch 'develop' of https://github.com/emperorjk/Triumph into develop

Conflicts:
	Triumph.v12.suo