Merge branch 'master' of 13.56.215.252:/web/rpo/AnsjerFormal

# Conflicts:
#	Ansjer/settings.py

Ansjer/settings.py

@@ -1,8 +1,7 @@
 import os
 
-SERVER_TYPE = 'local'
-# SERVER_TYPE = 'test'
-# SERVER_TYPE = 'formal'
+#SERVER_TYPE = 'test'
+SERVER_TYPE = 'formal'
 
 SECRET_KEY = 'c7ki2_gkg4#sjfm-u1%$s#&n#szf01f*v69rwv2qsf#-zmm@tl'
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))