-Update client
Merge branch 'master' of https://github.com/tritmt/xulyphanbo

Conflicts:
	Client/Poco/projects/PocoTest/Classes/GameContent/GameController/GameController.h
	Client/Poco/projects/PocoTest/Classes/Network/NetworkController.cpp
	Client/Poco/projects/PocoTest/Classes/Network/NetworkModel/NetworkLayer.cpp
	Client/Poco/projects/PocoTest/Classes/Network/NetworkModel/NetworkLayer.h
	Client/Poco/projects/PocoTest/Classes/UIClient/Scene/MainMenu/MainMenuScene.cpp
	Client/Poco/projects/PocoTest/Classes/UIClient/Scene/MainMenu/MainMenuScene.h
	Client/Poco/projects/PocoTest/proj.ios/PocoTest.xcodeproj/project.xcworkspace/xcuserdata/Developer3.xcuserdatad/UserInterfaceState.xcuserstate
	Client/Poco/projects/PocoTest/proj.ios/PocoTest.xcodeproj/xcuserdata/Developer3.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist