Merge branch 'develop' into dev-tee

# Conflicts:
#	src/app.config.ts

src/app.config.ts

@@ -6,16 +6,17 @@ import retirementResign from "./api/leave/api.leave"
 import placementTransfer from "./api/transfer/api.transfer"
 import appeal from "./api/appeal/api.appeal"
 import message from "./api/api.message"
-
+import evaluate from "./api/evaluate/api.evaluate";
 
 const API = {
-	...testtest,
-	...retirementResign,
-	...placementTransfer,
-	...message,
-	...appeal
-}
+  ...testtest,
+  ...retirementResign,
+  ...placementTransfer,
+  ...message,
+  ...evaluate,
+  ...appeal
+};
 
 export default {
-	API: API,
-}
+  API: API,
+};