Merge branch 'fragments-ui' of

ssh://git@gitorious.org/owncloud/android.git into fragments-ui

Conflicts:
	src/eu/alefzero/owncloud/datamodel/OCFile.java

diff --cc src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 10a8671,5bf7146..5ae763c
--- 1/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
--- 2/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@@ -272,4 -279,4 +279,4 @@@ public class FileDisplayActivity extend
  \r
                \r
        }\r
--}
++}