Merge remote-tracking branch 'remotes/origin/master' into hechu1

# Conflicts:
#	.idea/artifacts/GDMS_war_exploded.xml
#	.idea/artifacts/gdms_Web_exploded.xml
#	.idea/artifacts/gdms_war_exploded.xml
#	.idea/misc.xml

web/home/home.jsp

@@ -37,10 +37,10 @@
     pageContext.setAttribute("userType",type);
     Condition condition=user.getCondition();
     List<Process> pList=condition.getProcesses();
-    String name=condition.get(1).getButtonName();
     pageContext.setAttribute("list",pList);
     int length=pList.size();
     int index=0;
+    int num=0;
 %>
 <div class="main">
     <div class="top-bar">
@@ -84,11 +84,12 @@
                 </div>
                 <c:forEach items="${list}">
                     <div class="a-process">
-                        <a href="fillSbjMsg.jsp?<%=index++%>" class="link-point">
+                        <a href="<%=condition.get(num).getJspURL()%>?<%=index++%>" class="link-point">
                             <div class="a-process-decoration">
-                                <img src="../cssFile/images/filText.png">
+                                <img src=<%=condition.get(num).getIconURL()%>>
                             </div>
-                            <div class="nav-info"><%=name%></div>
+                            <div class="nav-info"><%=condition.get(num).getButtonName()%></div>
+                            <%num=num+1;%>
                         </a>
                     </div>
                 </c:forEach>