Merge branch 'master' of

https://github.com/MobileComputing2013/NewSeenIt

Conflicts:
	src/com/example/mobileseenit/apis/PxUploadTask.java

.gitignore

@@ -32,4 +32,10 @@ proguard/
 .idea/
 
 # Windows generated files
-Thumbs.db
+Thumbs.db
+/AndroidManifest.xml
+/ic_launcher-web.png
+/lint.xml
+/proguard-project.txt
+/project.properties
+/README.md

res/values/strings.xml

@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- API Keys -->
-    <string name="px_consumer_key">dZA3TRGzQovCSMnmKrTlg9wqWl14MeYpUSxbLGDm</string>
-    <string name="px_consumer_secret">LruK7dGr4Kyux1frxW9bHOcazGIS18DothLIYqvI</string>
-    <string name="flickr_api_key">af76271af34e193bd2f002eb32032e01</string>
-    <string name="flickr_secret">b7b96e8ab7032484</string>
-
-    <!-- Strings -->
-    <string name="app_name">MobileSeenIt</string>
-    <string name="action_settings">Settings</string>
-    <string name="title_section1">Section 1</string>
-    <string name="title_section2">Section 2</string>
-    <string name="title_section3">Section 3</string>
-    <string name="title_activity_main_fragment">MainFragment</string>
-    <string name="callbackurl">http://varundroid.blog.com</string>
-    <string name="image_capture_flash">flash</string>
-    <string name="image_upload_retake">Retake</string>
-    <string name="image_upload_upload">Upload</string>
-    <string name="login_username_label">Username:</string>
-    <string name="login_password_label">Password:</string>
-    <string name="title_activity_image_details">ImageDetailsActivity</string>
-    <string name="photo_title_label">Title:</string>
-    <string name="photo_link_label">Link:</string>
-    <string name="settings_image_diameter_label">Search Diameter:</string>
-    <string name="settings_before_label">Images Before:</string>
-    <string name="settings_after_label">Images After:</string>
-    <string name="settings_flickr_label">Flickr:</string>
-    <string name="settings_500px_label">500px:</string>
-    <string name="settings_not_logged_in">Not Logged In</string>
-
-    <string-array name="SearchDiameters">
-        <item>1 km</item>
-        <item>3 km</item>
-        <item>5 km</item>
-    </string-array>
-
-    <color name="background_colour">#6D89D5</color>
-    <color name="white">#FFFFFF</color>
-
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- API Keys -->
+    <string name="px_consumer_key">dZA3TRGzQovCSMnmKrTlg9wqWl14MeYpUSxbLGDm</string>
+    <string name="px_consumer_secret">LruK7dGr4Kyux1frxW9bHOcazGIS18DothLIYqvI</string>
+    <string name="flickr_api_key">af76271af34e193bd2f002eb32032e01</string>
+    <string name="flickr_secret">b7b96e8ab7032484</string>
+
+    <!-- Strings -->
+    <string name="app_name">MobileSeenIt</string>
+    <string name="action_settings">Settings</string>
+    <string name="title_section1">Section 1</string>
+    <string name="title_section2">Section 2</string>
+    <string name="title_section3">Section 3</string>
+    <string name="title_activity_main_fragment">MainFragment</string>
+    <string name="callbackurl">http://varundroid.blog.com</string>
+    <string name="image_capture_flash">flash</string>
+    <string name="image_upload_retake">Retake</string>
+    <string name="image_upload_upload">Upload</string>
+    <string name="login_username_label">Username:</string>
+    <string name="login_password_label">Password:</string>
+    <string name="title_activity_image_details">ImageDetailsActivity</string>
+    <string name="photo_title_label">Title:</string>
+    <string name="photo_link_label">Link:</string>
+    <string name="settings_image_diameter_label">Search Diameter:</string>
+    <string name="settings_before_label">Images Before:</string>
+    <string name="settings_after_label">Images After:</string>
+    <string name="settings_flickr_label">Flickr:</string>
+    <string name="settings_500px_label">500px:</string>
+    <string name="settings_not_logged_in">Not Logged In</string>
+
+    <string-array name="SearchDiameters">
+        <item>1 km</item>
+        <item>3 km</item>
+        <item>5 km</item>
+    </string-array>
+
+    <color name="background_colour">#6D89D5</color>
+    <color name="white">#FFFFFF</color>
+
 </resources>