Merge branch 'master' into test

# Conflicts:
#	Controller/AccessLog.py
#	Controller/AdminManage.py
#	Controller/AppInfo.py
#	Controller/EquipmentManager.py
#	Controller/MealManage.py
#	Controller/OTAEquipment.py
#	Controller/PermissionManager.py
#	Controller/SysManage.py
#	Controller/UserManger.py

Controller/EquipmentOTA.py

@@ -1,16 +1,17 @@
-from django.views.generic.base import View
+import os
+import simplejson as json
+
+from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
-from Service.ModelService import ModelService
-from Service.CommonService import CommonService
+from django.views.generic.base import View
+
+from Ansjer.config import BASE_DIR
 from Model.models import Equipment_Version
-from django.utils import timezone
-import os, simplejson as json
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
-from Ansjer.config import BASE_DIR
-from Ansjer.config import SERVER_DOMAIN
-import time
+from Service.CommonService import CommonService
+from Service.ModelService import ModelService
 
 '''
 http://192.168.136.45:8077/equipment/OTA?token=test&operation=query&page=1&line=10