Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-07 2109463fab2eb1caed189e4f258e0e763c5cea7b

 ZigbeeApp/GateWay.Ios/Info.plist

@@ -51,6 +51,7 @@
   <string>development</string>
   <key>UIBackgroundModes</key>
   <array>
      <string>location</string>
      <string>remote-notification</string>
   </array>
   <key>CFBundleShortVersionString</key>