add image upload for admins
fix merge
merge and precompile;