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

Controller/FAQController.py

@@ -20,7 +20,7 @@ from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from var_dump import var_dump
 
-from Service import ModelService
+from Service.ModelService import ModelService
 
 
 class FAQUploadView(View):