Merge remote-tracking branch 'origin/master'

pom.xml

@@ -107,10 +107,10 @@
            <groupId>commons-collections</groupId>
            <artifactId>commons-collections</artifactId>
        </dependency>
		<dependency>
		<!--<dependency>
            <groupId>com.yihu.ehr</groupId>
            <artifactId>commons-cat</artifactId>
        </dependency>
        </dependency>-->
    </dependencies>
    <build>