Merge branch 'develop' into navigationDrawer_basic

Conflicts FIXED:
	res/layout/files.xml

diff --cc res/layout/files.xml
index 268ee51,3f3617b..649c863
--- 1/res/layout/files.xml
--- 2/res/layout/files.xml
+++ b/res/layout/files.xml
@@@ -16,40 -16,29 +16,43 @@@
  \r
    You should have received a copy of the GNU General Public License\r
    along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
 - -->\r
 -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
 +  -->\r
 +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"\r
 +    android:id="@+id/drawer_layout"\r
      android:layout_width="match_parent"\r
      android:layout_height="match_parent"\r
 -    android:background="@color/background_color"\r
 -    android:orientation="horizontal"\r
 -    android:baselineAligned="false"\r
 -    android:id="@+id/ListLayout"\r
 -    android:contentDescription="@string/list_layout"\r
 -    >\r
 -\r
 -      <FrameLayout \r
 -              android:layout_width="0dp"\r
 -              android:layout_height="match_parent"\r
 -              android:layout_weight="1"\r
 -              android:id="@+id/left_fragment_container"\r
 -          />\r
 -      \r
 -      <FrameLayout \r
 -              android:layout_width="0dp"\r
 -              android:layout_height="match_parent"\r
 -              android:layout_weight="2"\r
 -              android:id="@+id/right_fragment_container"\r
 -          />\r
 -      \r
 - </LinearLayout>
 +    android:clickable="true" >\r
 +\r
 +    <!-- The main content view -->\r
 +    <LinearLayout\r
 +        xmlns:android="http://schemas.android.com/apk/res/android"\r
 +        android:layout_width="match_parent"\r
 +        android:layout_height="match_parent"\r
 +        android:background="@color/background_color"\r
 +        android:baselineAligned="false"\r
-         android:orientation="horizontal" >\r
++        android:orientation="horizontal"\r
++        android:id="@+id/ListLayout"\r
++        android:contentDescription="@string/list_layout"\r
++        >\r
 +\r
 +\r
 +        <FrameLayout\r
 +            android:id="@+id/left_fragment_container"\r
 +            android:layout_width="0dp"\r
 +            android:layout_height="match_parent"\r
 +            android:layout_weight="1" />\r
 +\r
 +        <FrameLayout\r
 +            android:id="@+id/right_fragment_container"\r
 +            android:layout_width="0dp"\r
 +            android:layout_height="match_parent"\r
 +            android:layout_weight="2" />\r
 +    </LinearLayout>\r
 +\r
 +    <include\r
 +        layout="@layout/drawer"\r
 +        android:layout_width="240dp"\r
 +        android:layout_height="match_parent"\r
 +        android:layout_gravity="start"/>\r
 +\r
- </android.support.v4.widget.DrawerLayout>
++</android.support.v4.widget.DrawerLayout>\r

diff --cc res/values/strings.xml
Simple merge