Merge remote-tracking branch 'remotes/origin/dev'

# Conflicts:
#	Ansjer/urls.py

Ansjer/urls.py

@@ -213,8 +213,8 @@ urlpatterns = [
     url(r'^account/appFrequency/(?P<operation>.*)$', UserController.UserAppFrequencyView.as_view()),
     url(r'^v2/userbrand/(?P<operation>.*)$', UserBrandControllerV2.UserBrandV2.as_view()),
     # url(r'^test/add$', GenerateDataController.GenerateDataView.as_view()),
-    url(r'^statistcs/appFrequencyMonth$', StatisticsController.statistcsAppFrequency),
-    url(r'^statistcs/appFrequencyYear$', StatisticsController.statistcsAppFrequencyYear),
+    # url(r'^statistcs/appFrequencyMonth$', StatisticsController.statistcsAppFrequency),
+    # url(r'^statistcs/appFrequencyYear$', StatisticsController.statistcsAppFrequencyYear),
     # app 设备消息模板
     # 路由加参数参考
     # url(r'^(?P<path>.*)/(?P<UID>.*)/lls$', Test.Test.as_view(), name=u'gg'),