Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

# Conflicts:
#	Model/models.py

Controller/UserController.py

@@ -2088,7 +2088,7 @@ class alexaUidView(TemplateView):
             for uid_q in uid_qs:
                 uid_list.append(uid_q['UID'])
                 uid_dict[uid_q['UID']] = {'nick': uid_q['NickName'], 'password': uid_q['View_Password']}
-            us_qs = UidSetModel.objects.filter(uid__in=uid_list, is_alexa=1).values('uid', 'alexa_region')
+            us_qs = UidSetModel.objects.filter(uid__in=uid_list, is_alexa=2).values('uid', 'p2p_region')
             uid_arr = []
             for us in us_qs:
                 uid = us['uid']