Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -1782,7 +1782,7 @@ U.MD.D.I.trialTeacherDeskIcon = [
     { "Name": "学生评价", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
     { "Name": "CocoFlow", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
-		{ "Name": "知识库", "Url": "knowledge", "style": { "cssText": "background-image:url(/img/icon/knowledge.png)" } },
+    { "Name": "知识库", "Url": "knowledge", "style": { "cssText": "background-image:url(/img/icon/knowledge.png)" } },
 ];
 
 //trial
@@ -1791,6 +1791,7 @@ U.MD.D.I.trialStudentDeskIcon = [
     // { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
     { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
     // { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "CocoFlow", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
 ];