目录调整
Merge branch 'master' of https://github.com/hairongwang/wanghr.git

Conflicts:
	src/wanghr-business/wanghr-business-web-tour/.classpath
	src/wanghr-business/wanghr-business-web-tour/.gitignore
	src/wanghr-core/.classpath
	src/wanghr-core/.gitignore
	src/wanghr-site/wanghr-site-web-tour/.classpath
	src/wanghr-site/wanghr-site-web-tour/.gitignore