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

Controller/FAQController.py

@@ -68,7 +68,7 @@ class FAQUploadView(View):
                     file_name = images[str(fileName)]
                     index = file_name.find('static/')
                     filePath = file_name[index:]
-                    if SERVER_TYPE != "Ansjer.formal_settings":
+                    if SERVER_TYPE == "Ansjer.formal_settings":
                         filePath = 'http://www.dvema.com/faq/image/' + filePath
                     else:
                         filePath = 'http://test.www.dvema.com/faq/image/' + filePath
@@ -106,7 +106,7 @@ class FAQUploadView(View):
         else:
             index = file_name.find('static/')
             filePath = file_name[index:]
-            if SERVER_TYPE != "Ansjer.formal_settings":
+            if SERVER_TYPE == "Ansjer.formal_settings":
                 filePath = 'http://www.dvema.com/faq/image/' + filePath
             else:
                 filePath = 'http://test.www.dvema.com/faq/image/' + filePath