Updated for new Editor
Merge branch 'master' of https://github.com/CarlRapp/CodenameGamma
Merge branch 'pr/n140_TENFIRE' into newmaster

Conflicts:
	CodenameGamma/Screen/PlayScreen/Level/LevelParser.cpp
Merge pull request #141 from CarlRapp/master

Update