replaced ImageField with UploadField
Merge branch 'imagefieldreplacement'