-commit for merger
-merger
Merge branch 'master' of https://github.com/tritmt/xulyphanbo

Conflicts:
	Client/Poco/projects/PocoTest/proj.ios/PocoTest.xcodeproj/project.pbxproj
	Server/nbproject/project.properties
-update