Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

watero-rst-web/src/main/webapp/WEB-INF/views/base/add_base.ftl

@@ -28,6 +28,4 @@
 <script type="text/javascript">
     var root_path = "${path}";
 </script>
-
-
 <script type="text/javascript" src="${path}/common/js/common/common.js"></script>

watero-rst-web/src/main/webapp/WEB-INF/views/base/list_base.ftl

@@ -24,7 +24,6 @@
 <script type="text/javascript" src="${path}/common/lib/laypage/1.2/laypage.js"></script>
 
 <script type="text/javascript">
-    // 判断
     var root_path = "${path}";
 </script>