Merge branch 'master' into Devbranch1
Revert "EditBox Working"

This reverts commit 33e2199a1c85439f0903896ff27a8f4c4a656f45.

Conflicts:
	Classes/MenuNewGameController.cpp
Revert 33e2199..4359ab6

This rolls back to commit 33e2199a1c85439f0903896ff27a8f4c4a656f45.
Merge branch 'Devbranch11' into Devbranch1
Commit

Reversion
Merge branch 'Devbranch1'