Merge branch 'infoGrabs' into test-merge

Manual merge, still need to add compressing recycler view stuff

app/src/main/res/layout/fragment_settings.xml

@@ -10,6 +10,7 @@
         android:layout_height="match_parent">
 
         <RadioGroup
+            android:id="@+id/setting_radio_group"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
@@ -23,6 +24,7 @@
                 android:id="@+id/setting_default_size_video"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:checked="true"
                 android:text="@string/settings_default_size" />
 
             <RadioButton

app/src/main/res/menu/action_bar_menu.xml

@@ -6,5 +6,15 @@
         android:id="@+id/add"
         android:title="Add"
         android:icon="@drawable/ic_add"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="ifRoom" >
+        <menu>
+            <item
+                android:id="@+id/addFile"
+                android:title="@string/files" />
+            <item
+                android:id="@+id/addYoutube"
+                android:title="@string/youtube" />
+        </menu>
+    </item>
+
 </menu>

app/src/main/res/values/strings.xml

@@ -10,4 +10,6 @@
     <string name="settings_huge_size">500mb</string>
     <string name="settings_custom_size">Custom</string>
     <string name="settings_custom_size_hint">Enter Size in MB</string>
+    <string name="files">Files</string>
+    <string name="youtube">Youtube</string>
 </resources>