Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

manifest.json

@@ -200,7 +200,9 @@
             "VideoPlayer" : {},
             "Bluetooth" : {},
             "Geolocation" : {},
-            "LivePusher" : {}
+            "LivePusher" : {},
+            "Camera" : {},
+            "Gallery" : {}
         },
         "splashscreen" : {
             "waiting" : false