Conflicts:

	src/com/owncloud/android/ui/activity/FileDisplayActivity.java

This can go in by now.

Conflicts:
	AndroidManifest.xml
	res/menu/main_menu.xml
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/InstantUploadService.java
	src/com/owncloud/android/operations/SynchronizeFileOperation.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDetailActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
	src/eu/alefzero/webdav/FileRequestEntity.java
	src/eu/alefzero/webdav/WebdavClient.java

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

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

Fixed (tablet landscape): video playback is resumed in the moment it was left when the user pressed HOME

Fixed (tablet, landscape): when the 'playing audio' notification is clicked, the app shows the current playback details

Patch to fix the lack of progress circle at the first sycnhronization of the first-created account, in Android 2.x

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

Conflicts:
	AndroidManifest.xml
	res/menu/file_context_menu.xml
	res/menu/menu.xml
	res/values-de-rDE/strings.xml
	res/values/strings.xml
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java

Log2EmailActivity in LogHistoryActivity

Quick & dirty fix to avoid that 'create folder' dialog keeps the name of the last created dialog in the input field

Improvementes in full screen video: tap on video shows and hides controls; full screen available in portrait; fade out for controls reduced to 4 seconds

- add simple Activity for none InstantUloads to show the whole
error-message

InstantUploadService
- new method to create the full path for the instantupload's
- add QUOTA_EXCEEDED to RemoteOperationResult.ResultCode enum to hande
http-507 from oc
- handle RuntimeException at connection lost as HOST_NOT_AVAILABLE
- add the error message for failed uploads for every not uploaded
picture, espacially  for QUOTA_EXCEEDED is it necessary to show that to
the user

Build owncloud apk via Maven, replacement or supplement for the setup script.

setup_env.bat included and improved setup text a bit

Saved isplaying state to avoid autoplay when a video is paused and the device orientation is changed