Merge branch 'haow/dev' into 'test'

fix

See merge request !135

api/urls.py

@@ -39,7 +39,6 @@ urlpatterns = [
     url(r'^user/list/update$', UserListView.as_view()),
     url(r'^user/get$', UserUpdateOrCreate.as_view()),
     url(r'^user/create$', UserUpdateOrCreate.as_view()),
-    url(r'^user/pictorial/list$', PictorialUserList.as_view()),
     url(r'^user/images/get$', UserImage.as_view()),
     url(r'^user/images/create$', UserImage.as_view()),
 
@@ -129,6 +128,7 @@ urlpatterns = [
     url(r'^pictorial/get$', PictorialUpdateOrCreate.as_view()),
     url(r'^pictorial/create$', PictorialUpdateOrCreate.as_view()),
     url(r'^pictorial/topics$', PictorialTopics.as_view()),
+    url(r'^pictorial/user/list$', PictorialUserList.as_view()),
 ]
 
 search_urlpatterns = [