Merge remote-tracking branch 'origin/master'

Lighting/Lighting.xcodeproj/project.pbxproj

@@ -1922,7 +1922,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
+				PROVISIONING_PROFILE = "e9bd3600-5e9c-4cd0-a0d5-b7d8b0882ca8";
 				STRIP_PNG_TEXT = NO;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};
@@ -1978,7 +1978,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "f89bebf5-81e2-4c61-9052-8c7bb0f9ddd6";
+				PROVISIONING_PROFILE = "e9bd3600-5e9c-4cd0-a0d5-b7d8b0882ca8";
 				STRIP_PNG_TEXT = NO;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
 			};

Lighting/Lighting/Info.plist

@@ -41,8 +41,6 @@
 			</array>
 		</dict>
 	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>wechat</string>

Lighting/Podfile.lock

@@ -21,7 +21,7 @@ PODS:
   - Masonry (0.6.4)
   - MBProgressHUD (0.9.2)
   - MJExtension (3.0.10)
-  - MJRefresh (3.1.0)
+  - MJRefresh (3.1.1)
   - MMDrawerController (0.6.0):
     - MMDrawerController/Core (= 0.6.0)
     - MMDrawerController/MMDrawerBarButtonItem (= 0.6.0)
@@ -64,7 +64,7 @@ SPEC CHECKSUMS:
   Masonry: 281802d04d787ea2973179ee8bcb50500579ede2
   MBProgressHUD: 1569cf7ace17a8bac47aabfbb8580a49690386d1
   MJExtension: d86aacb740c87519d20e3cca55b6fa4be6cc7548
-  MJRefresh: 743e6404967d1c2c688472ea3ecfde247d872db4
+  MJRefresh: 70a47c5543b567cdaf70ead5a6e99ce820652eb9
   MMDrawerController: e3a54a5570388463ad3b36975251575b50c4e1a0
   SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
   SVProgressHUD: b0830714205bea1317ea1a2ebc71e5633af334d4