测试
Merge branch 'master' of https://github.com/chengcheng222e/vernon-webspider

Conflicts:
	.gitignore
	trunk/trunk.iml