Fixing totally broken merge
Cropsizes config and upload compatible

Refactors imagecropper and fileupload to use the samen metadata setting
extensions