google 1
Merge branch 'master' of https://github.com/heavenllf/DigitalPlan

Conflicts:
	LcFacialUtility/dllmain.cpp