Merge branch 'develop' into setup_buttons

diff --cc src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
Simple merge

diff --cc src/com/owncloud/android/files/services/FileDownloader.java
Simple merge

diff --cc src/com/owncloud/android/files/services/FileObserverService.java
Simple merge

diff --cc src/com/owncloud/android/files/services/FileUploader.java
Simple merge

diff --cc src/com/owncloud/android/operations/SynchronizeFolderOperation.java
Simple merge

diff --cc src/com/owncloud/android/syncadapter/FileSyncAdapter.java
Simple merge

diff --cc src/com/owncloud/android/ui/activity/FileDisplayActivity.java
Simple merge

diff --cc src/com/owncloud/android/ui/fragment/FileDetailFragment.java
Simple merge

diff --cc src/com/owncloud/android/ui/preview/PreviewImageActivity.java
Simple merge