Merge remote-tracking branch 'theirs/develop' into develop
Merge branch 'develop' of github.com:owncloud/android into develop

Conflicts:
	owncloud-android-library
Merge branch 'develop' of github.com:owncloudChalmers/android into develop
Adds icons and image-previews for files in the upload list.
Local preview now integrates with the cache.
Merges local_image_preview