Merge branch 'us4_view_text_files' of github.com:owncloudChalmers/android into us4_view_text_files

Conflicts:
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java