Full-account synchronization should never fetch the contents of a folder
if its eTag did not change
Bump app version to 1.6.1
Bump workaround app version to 1.0.19
Merge pull request #675 from owncloud/hotfix_full_sync_ignoring_etag

HOTFIX - Full-account synchronization should never fetch the contents of a folder...
prawidlowa biblioteka android-support-v4.jar
przerobienie aplikacji dla naszych potrzeb

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/folder_public.png
	res/drawable-mdpi/folder_public.png
	res/drawable-mdpi/sharedlink.png
	res/drawable-xhdpi/sharedlink.png
	res/values-af-rZA/strings.xml
	res/values-ak/strings.xml
	res/values-am-rET/strings.xml
	res/values-ar/strings.xml
	res/values-az/strings.xml
	res/values-be/strings.xml
	res/values-bg-rBG/strings.xml
	res/values-bn-rBD/strings.xml
	res/values-bn-rIN/strings.xml
	res/values-bs/strings.xml
	res/values-ca/strings.xml
	res/values-cs-rCZ/strings.xml
	res/values-cy-rGB/strings.xml
	res/values-da/strings.xml
	res/values-de-rAT/strings.xml
	res/values-de-rCH/strings.xml
	res/values-de-rDE/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-en-rGB/strings.xml
	res/values-en-rNZ/strings.xml
	res/values-eo/strings.xml
	res/values-es-rAR/strings.xml
	res/values-es-rBO/strings.xml
	res/values-es-rCL/strings.xml
	res/values-es-rCO/strings.xml
	res/values-es-rCR/strings.xml
	res/values-es-rEC/strings.xml
	res/values-es-rMX/strings.xml
	res/values-es-rPE/strings.xml
	res/values-es-rPY/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es-rUY/strings.xml
	res/values-es/strings.xml
	res/values-et-rEE/strings.xml
	res/values-eu-rES/strings.xml
	res/values-eu/strings.xml
	res/values-fa/strings.xml
	res/values-fi-rFI/strings.xml
	res/values-fr-rCA/strings.xml
	res/values-fr/strings.xml
	res/values-gl/strings.xml
	res/values-he/strings.xml
	res/values-hi-rIN/strings.xml
	res/values-hi/strings.xml
	res/values-hr/strings.xml
	res/values-hu-rHU/strings.xml
	res/values-hy/strings.xml
	res/values-ia/strings.xml
	res/values-id/strings.xml
	res/values-is/strings.xml
	res/values-it/strings.xml
	res/values-ja-rJP/strings.xml
	res/values-jv/strings.xml
	res/values-ka-rGE/strings.xml
	res/values-km/strings.xml
	res/values-kn/strings.xml
	res/values-ko/strings.xml
	res/values-ku-rIQ/strings.xml
	res/values-lb/strings.xml
	res/values-lt-rLT/strings.xml
	res/values-lv/strings.xml
	res/values-mk/strings.xml
	res/values-ml-rIN/strings.xml
	res/values-ml/strings.xml
	res/values-mn/strings.xml
	res/values-ms-rMY/strings.xml
	res/values-my/strings.xml
	res/values-nb-rNO/strings.xml
	res/values-ne/strings.xml
	res/values-nl/strings.xml
	res/values-nn-rNO/strings.xml
	res/values-oc/strings.xml
	res/values-or-rIN/strings.xml
	res/values-pa/strings.xml
	res/values-pt-rBR/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-si-rLK/strings.xml
	res/values-sk-rSK/strings.xml
	res/values-sk/strings.xml
	res/values-sl/strings.xml
	res/values-sq/strings.xml
	res/values-sr-rSP/strings.xml
	res/values-sr/strings.xml
	res/values-su/strings.xml
	res/values-sv/strings.xml
	res/values-sw-rKE/strings.xml
	res/values-ta-rIN/strings.xml
	res/values-ta-rLK/strings.xml
	res/values-te/strings.xml
	res/values-th-rTH/strings.xml
	res/values-tr/strings.xml
	res/values-ug/strings.xml
	res/values-uk/strings.xml
	res/values-ur-rPK/strings.xml
	res/values-ur/strings.xml
	res/values-uz/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rHK/strings.xml
	res/values-zh-rTW/strings.xml
	res/xml/preferences.xml
	src/com/mdrive/android/authentication/AccountAuthenticator.java
	src/com/mdrive/android/authentication/AuthenticatorActivity.java
	src/com/mdrive/android/authentication/SsoWebViewClient.java
	src/com/mdrive/android/datamodel/FileDataStorageManager.java
	src/com/mdrive/android/datamodel/OCFile.java
	src/com/mdrive/android/db/DbHandler.java
	src/com/mdrive/android/files/BootupBroadcastReceiver.java
	src/com/mdrive/android/files/FileOperationsHelper.java
	src/com/mdrive/android/files/InstantUploadBroadcastReceiver.java
	src/com/mdrive/android/files/services/FileDownloader.java
	src/com/mdrive/android/files/services/FileUploader.java
	src/com/mdrive/android/media/MediaService.java
	src/com/mdrive/android/media/MediaServiceBinder.java
	src/com/mdrive/android/operations/CreateFolderOperation.java
	src/com/mdrive/android/operations/CreateShareOperation.java
	src/com/mdrive/android/operations/DownloadFileOperation.java
	src/com/mdrive/android/operations/GetServerInfoOperation.java
	src/com/mdrive/android/operations/GetSharesForFileOperation.java
	src/com/mdrive/android/operations/GetSharesOperation.java
	src/com/mdrive/android/operations/OAuth2GetAccessToken.java
	src/com/mdrive/android/operations/RenameFileOperation.java
	src/com/mdrive/android/operations/SynchronizeFileOperation.java
	src/com/mdrive/android/operations/SynchronizeFolderOperation.java
	src/com/mdrive/android/operations/UnshareLinkOperation.java
	src/com/mdrive/android/operations/UpdateOCVersionOperation.java
	src/com/mdrive/android/operations/UploadFileOperation.java
	src/com/mdrive/android/providers/FileContentProvider.java
	src/com/mdrive/android/services/OperationsService.java
	src/com/mdrive/android/services/observer/FileObserverService.java
	src/com/mdrive/android/services/observer/FolderObserver.java
	src/com/mdrive/android/syncadapter/FileSyncAdapter.java
	src/com/mdrive/android/ui/PreferenceMultiline.java
	src/com/mdrive/android/ui/activity/AccountSelectActivity.java
	src/com/mdrive/android/ui/activity/ConflictsResolveActivity.java
	src/com/mdrive/android/ui/activity/ErrorsWhileCopyingHandlerActivity.java
	src/com/mdrive/android/ui/activity/FileActivity.java
	src/com/mdrive/android/ui/activity/FileDisplayActivity.java
	src/com/mdrive/android/ui/activity/LogHistoryActivity.java
	src/com/mdrive/android/ui/activity/Preferences.java
	src/com/mdrive/android/ui/activity/UploadFilesActivity.java
	src/com/mdrive/android/ui/activity/Uploader.java
	src/com/mdrive/android/ui/adapter/FileListListAdapter.java
	src/com/mdrive/android/ui/dialog/ConfirmationDialogFragment.java
	src/com/mdrive/android/ui/dialog/SamlWebViewDialog.java
	src/com/mdrive/android/ui/dialog/ShareLinkToDialog.java
	src/com/mdrive/android/ui/dialog/SslUntrustedCertDialog.java
	src/com/mdrive/android/ui/dialog/SslValidatorDialog.java
	src/com/mdrive/android/ui/fragment/ExtendedListFragment.java
	src/com/mdrive/android/ui/fragment/FileDetailFragment.java
	src/com/mdrive/android/ui/fragment/LocalFileListFragment.java
	src/com/mdrive/android/ui/fragment/OCFileListFragment.java
	src/com/mdrive/android/ui/preview/FileDownloadFragment.java
	src/com/mdrive/android/ui/preview/PreviewImageActivity.java
	src/com/mdrive/android/ui/preview/PreviewImageFragment.java
	src/com/mdrive/android/ui/preview/PreviewImagePagerAdapter.java
	src/com/mdrive/android/ui/preview/PreviewMediaFragment.java
	src/com/mdrive/android/ui/preview/PreviewVideoActivity.java
	src/com/mdrive/android/utils/ErrorMessageAdapter.java
	src/com/mdrive/android/utils/Log_OC.java

Conflicts:
	AndroidManifest.xml
merge to 1.6.0
ikony i poprawki do czytnikow bez dotyku
nawigacja w oknie logowania dla ekranu bez dotyku