trigger Media Scan on:
- download
- delete local (on list and details)
- delete local & remote (on list and details)
added "x folders and y files" to end of list
- minor design changes
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 fileCount

Conflicts:
	res/layout/list_fragment.xml
	res/values/strings.xml
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
-rebase on develop
Add view for selecting upload path folder browsing through local file list in preferences view
Create FolderPickerActivity from which MoveActivity and UploadPathActivity extend
Remove files_move layout after creating files_folder_picker one
Create custom Preference ui for truncate automatically the upload folder path in the middle when it is too long
When user goes to set the upload path, the folder list view is shown in the current path set
Remove 'sort' and 'logs' options from action bar menu when showing the selecting upload path folder view
Add new preference on settings for setting the upload video path
Merge branch 'develop' into instant_uploads_set_path
Remove last slash from uploads path (video/image) when showing them on settings view and they are not root folder