Merge branch 'master' of http://git.biandejun.com/iLearning/elearn

# Conflicts:
#	pom.xml

pom.xml

@@ -69,7 +69,7 @@
 
     <distributionManagement>
     <snapshotRepository>
-        <id>snapshots</id>
+        <id>learning-data</id>
         <url>http://192.168.0.15:8081/repository/learning-data/</url>
     </snapshotRepository>
 </distributionManagement>