Merge branch 'develop' into feature/circle

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityShareContent/CommunityShareContentViewController.swift

@@ -165,7 +165,8 @@ class CommunityShareContentViewController: BaseViewController {
     lazy var scrollView : UIScrollView = {
         let scrollView = UIScrollView(frame: CGRect(x: 0, y: kNavBarTotalHeight, width: kScreenWidth, height: kScreenHeight-kNavBarTotalHeight-152))
         scrollView.contentSize = CGSize(width: kScreenWidth, height: 667*kScaleWidth)
-        scrollView.backgroundColor = kffffffColor
+        scrollView.backgroundColor = UIColor(patternImage: kImage(name: "chat_pic_bg")!)
+        
         return scrollView
     }()
     

RainbowPlanet/RainbowPlanet/Supporting Files/CommunityModule.xcassets/pic_select_bg.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "pic_select_bg@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "pic_select_bg@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}