them scene lay lai mat khau

///
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/logicGame/Defs.h
	Classes/scene/MainScene.cpp