Merge branches 'master' and 'test_branch' of http://git.yvanui.com/hust/wuhan_epi

# Conflicts:
#	whepi-ui/templates/home/ribao.js

whepi-ui/templates/home/ribao.js

@@ -702,8 +702,7 @@ function ribao_cell(v) {
       else
         todayLocal = "今日所在地：" + v.todayLocalOther + "；";
     }
-    var uptownId = $("#uptownId").val();
-    if (v.isTrip != undefined && uptownId == '5')
+    if (v.isTrip != undefined )
       isTrip = "是否出行：" + getIsTrip(v.isTrip) + "；"
 
     if (v.tripDet != undefined)