Merge branch 'alpha' into submodule-updates-alpha

Config.xcconfig

@@ -5,7 +5,7 @@ COPYRIGHT_NOTICE =
 DEVELOPER_TEAM = ##TEAM_ID##
 BUNDLE_IDENTIFIER = org.nightscout.$(DEVELOPMENT_TEAM).openiaps
 APP_GROUP_ID = group.com.$(DEVELOPMENT_TEAM).loopkit.LoopGroup
-APP_ICON = OiAPS_Icon
+APP_ICON = oiapsBlack
 APP_URL_SCHEME = Open-iAPS
 
 #include? "../../ConfigOverride.xcconfig"

FreeAPS/Resources/Assets.xcassets/podPurple.appiconset/Contents.json → FreeAPS/Resources/Assets.xcassets/diabeetus.appiconset/Contents.json

@@ -1,13 +1,13 @@
 {
   "images" : [
     {
-      "filename" : "Pod2.png",
+      "filename" : "17 1.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
     },
     {
-      "filename" : "Pod2 1.png",
+      "filename" : "18.png",
       "idiom" : "universal",
       "platform" : "watchos",
       "size" : "1024x1024"

FreeAPS/Resources/Assets.xcassets/podTemplateBlack.appiconset/Contents.json → FreeAPS/Resources/Assets.xcassets/oiAPSWhiteShadow.appiconset/Contents.json

@@ -1,13 +1,13 @@
 {
   "images" : [
     {
-      "filename" : "pod4.png",
+      "filename" : "D.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
     },
     {
-      "filename" : "pod4 1.png",
+      "filename" : "D 1.png",
       "idiom" : "universal",
       "platform" : "watchos",
       "size" : "1024x1024"

FreeAPS/Resources/Assets.xcassets/oiaps3D.appiconset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "filename" : "OiAPS  3d.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "filename" : "3D Watch.png",
+      "idiom" : "universal",
+      "platform" : "watchos",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}