Merge remote-tracking branch 'origin/develop' into folderSizeInfo

Conflicts:
	.classpath
	tests/.classpath

diff --combined .classpath
index cbaab1a,d57ec02..2731f9c
--- 1/.classpath
--- 2/.classpath
+++ b/.classpath
@@@ -1,9 -1,9 +1,9 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
 -      <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 -      <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="src" path="gen"/>
--      <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
++      <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 +      <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
++      <classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
        <classpathentry kind="output" path="bin/classes"/>
  </classpath>

diff --combined tests/.classpath
index 657a459,5940126..2731f9c
--- 1/tests/.classpath
--- 2/tests/.classpath
+++ b/tests/.classpath
@@@ -1,10 -1,11 +1,9 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
 -      <classpathentry combineaccessrules="false" kind="src" path="/owncloud-android"/>
 -      <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 -      <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 -      <classpathentry exported="true" kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
        <classpathentry kind="src" path="src"/>
        <classpathentry kind="src" path="gen"/>
 -      <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 +      <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 +      <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-       <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-       <classpathentry combineaccessrules="false" kind="src" path="/owncloud-android"/>
++      <classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
        <classpathentry kind="output" path="bin/classes"/>
  </classpath>