Merge pull request #236 from pennlabs/development

Update 5.1.3

Author: joshdoman

PennMobile.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -61,6 +61,15 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F230FB0D225809E900760499"
+            BuildableName = "AutomatedScreenshotUITests.xctest"
+            BlueprintName = "AutomatedScreenshotUITests"
+            ReferencedContainer = "container:PennMobile.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

PennMobile.xcodeproj/xcshareddata/xcschemes/AutomatedScreenshotUITests.xcscheme

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

PennMobile/Assets.xcassets/Dining/Dining Balance icons/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "marks.jpg",
+      "filename" : "Card-sq.png",
       "scale" : "1x"
     },
     {

PennMobile/Assets.xcassets/Dining/Dining Balance icons/card.imageset/Card-sq.png

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "arch.jpg",
+      "filename" : "Coin-sq.png",
       "scale" : "1x"
     },
     {

…ining/Mark's Cafe.imageset/Contents.json …alance icons/card.imageset/Contents.jsonPennMobile/Assets.xcassets/Dining/Mark's Cafe.imageset/Contents.json renamed to PennMobile/Assets.xcassets/Dining/Dining Balance icons/card.imageset/Contents.json PennMobile/Assets.xcassets/Dining/Mark's Cafe.imageset/Contents.json renamed to PennMobile/Assets.xcassets/Dining/Dining Balance icons/card.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Friends-sq.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}