Namespace refactoring (part 7)
Prepare for merge
Merge branch 'fix_branch'

Conflicts:
	include/NEngine/CSave.h
	include/NEngine/NEvent/CEventManager.h
	include/NHud/CText.h
	include/NScene/CSceneGameplay.h
	src/NEngine/CGame.cpp
	src/NEngine/CKeyboard.cpp
	src/NEngine/CPlayerControl.cpp
	src/NEngine/CSave.cpp
	src/NEngine/CTimer.cpp
File recovery