Merge remote-tracking branch 'origin/master'

# Conflicts:
#	len-sys/len-sys.iml
#	len-web/len-web.iml

.gitignore

@@ -4,3 +4,4 @@
 len-web/target/
 len-core/target/
 len-sys/target/
+*.iml

len-sys/pom.xml

@@ -23,7 +23,16 @@
         <groupId>com.len</groupId>
         <artifactId>len-core</artifactId>
       </dependency>
-
+    <dependency>
+      <groupId>cn.lenos</groupId>
+      <artifactId>yunmaozj-common</artifactId>
+      <version>0.0.7</version>
+    </dependency>
+    <dependency>
+      <groupId>com.lenos</groupId>
+      <artifactId>lenos-common</artifactId>
+      <version>0.0.1</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>