Merge commit '4c415066f29f70a7beb820bc06afe8238722409a' into TrunkEric
Merge branch 'TrunkEric' into masterOnLocal

Conflicts:
	XML测试.xml