fix包依赖问题
fix包依赖问题
Merge remote-tracking branch 'origin/20141026'

Conflicts:
	wedsos-web/pom.xml