Merge branch ‘develop’ of github.com:rileytestut/Delta into develop

Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -33,13 +33,13 @@
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "icon_120.png",
+      "filename" : "icon-120.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "icon_180.png",
+      "filename" : "icon-180.png",
       "scale" : "3x"
     }
   ],

Resources/Assets.xcassets/BoxArt.imageset/Contents.json

@@ -2,22 +2,21 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "BoxArt.png",
+      "filename" : "boxart-100.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "BoxArt@2x.png",
+      "filename" : "boxart-200.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "BoxArt@3x.png",
+      "filename" : "boxart-300.png",
       "scale" : "3x"
     },
     {
       "idiom" : "tv",
-      "filename" : "BoxArt-1.png",
       "scale" : "1x"
     }
   ],

Resources/Assets.xcassets/Delta.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "logo_thick.png",
+      "filename" : "launch_logo.png",
       "scale" : "1x"
     },
     {