Merge branch 'master' of http://gitlib.occloud.net/biao/ZhiNanZhen

# Conflicts:
#	src/manager/templates/account_edit_input.inc

src/settings/compass_include.inc

@@ -13,12 +13,31 @@ require_once(COMPASS_LIB_ROOT . "/cn/compass/handler/CompassDBHandler.inc");
 // entity
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/EntityBase.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CompassDynamicData.inc");
-require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/SystemConstDat.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/AccountMst.inc");
-require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/GradeMst.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/ArticleCategoryMst.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/ArticleCommentDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/ArticleDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/ArticleTagsDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CircleDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/CircleMemberDat.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/ClassMst.inc");
-require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/OrganizationMst.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/EventDat.inc");
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/GovernmentMst.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/GradeMst.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/MiniplayTrafficClickDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/MiniplayTrafficClickLog.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/OrganizationMst.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/SchoolMst.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/SystemConstantDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/TeacherMst.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserAccessDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserCommentDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserFavoriteDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserMst.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserPointLog.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserSignDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/UserStaffRelationDat.inc");
+require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/SystemConstDat.inc");
 
 // definition
 require_once(COMPASS_LIB_ROOT . "/cn/compass/entity/definition/ImageType.inc");