Merge branch 'dev' of git.dev.yoho.cn:yoho30/yohobuy-union into dev

# Conflicts:
#	web/src/main/webapp/META-INF/autoconf/databases.yml

@@ -2,6 +2,5 @@
     <wb-module deploy-name="yoho-unions-server">
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
         <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/" source-path="/src/test/java"/>
     </wb-module>
 </project-modules>