Merge branch 'master' into release_1.5.2

kevzlou7979 · kevzlou7979 · commit 18bd8a7e0ec6 · 2016-06-28T12:22:02.000+08:00
# Conflicts:
#	gwt-material/pom.xml
#	pom.xml
diff --git a/gwt-material/pom.xml b/gwt-material/pom.xml
@@ -52,4 +52,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -299,4 +299,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>
