trigger Media Scan on:
- download
- delete local (on list and details)
- delete local & remote (on list and details)
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan

Conflicts:
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/com/owncloud/android/ui/preview/PreviewImageActivity.java
	src/com/owncloud/android/ui/preview/PreviewImageFragment.java
- update to obey non-image files
- fixed wrong project.properties
- moved MediaScan to DownloadFileOperation.
- cleaned up
- clean up 2
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
- removed Log
bugfix
- trigger works when moving files
- trigger mediaScan when files are deleted remote
cleanup
Temporary fix of missing escape for apostrophe
- restore some files :/
- test fix for android 4
Merge remote-tracking branch 'upstream/develop' into triggerMediaScan
-fr/strings.xml

Conflicts:
	src/com/owncloud/android/datamodel/FileDataStorageManager.java
	src/com/owncloud/android/datamodel/OCFile.java
Refactoring: get MediaScan trigger out of OCFile for renaming
Refactoring: move all the intents for MediaScanner in FileDataStorageManager to a single method