Cache mimetype icons
Only update metadata that has changed
Organize conditionals in a better order
Style fixes
Merge pull request #3530 from owncloud/cache-mimeicon

Cache mimetype icons
Merge pull request #3532 from owncloud/scan-update

Only update metadata that has changed
Merge branch 'master' into remove_unused_vars