various edits
Merge branch 'master' of https://github.com/col726/game-engine-CMZ

Conflicts:
	CMZEngine/src/main/CMZEngine.java

Signed-off-by: ColinM <col726@gmail.com>
merged file