basic picture updloading, changes to items form
fixed merge errors