Bug Fixes

Signed-off-by: Alexander Ivannikov <Alexivan_91@hotmail.com>
Merge branch 'master' of https://github.com/Malow/NDYEditor

Conflicts:
	ProjectC++/Code/GameEngine.cpp

Signed-off-by: Alexander Ivannikov <Alexivan_91@hotmail.com>