added carrierwave fields to edit user form ~leph
updated merged files