use avconv instead of ffmpeg
separate uploading code from progress code, add progress capability detection
Merge branch 'master' into fix_3728_with_file_exists_dialog

Conflicts:
	apps/files/js/file-upload.js
more is_resource checks before readdir
[tx-robot] updated from transifex
Merge branch 'master' into sharing_mail_notification_master

increased version number to trigger db update

Conflicts:
	lib/util.php
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
cleanup dead code
Only use mimetype_list and clean up a bit
Fix an IE8 bug with the avatarcropper.

1. Crop an avatar
2. Crop another avatar without reloading
-> Second cropper is 28px x 30px big
Clean up avatars and preliminary use JSON->rawlist.php
Sort files by name, not by mimetype
Use \OC_App for checking whether encryption is enabled
Merge pull request #4704 from owncloud/rename-lostpassword-controller

Use the namespaced variation of the classname.
Revert "fixes #4574"

This reverts commit 81a45cfcf1c7064615429bb3f9759e9455868614.
Use usort() instead of uasort() to not maintain keys
Split personal and user-mgmt password change logic
intermediate result ocs api
prefix #filestable to tbody tr
re-added error.php