Fixed image uploading
Merge branch 'api' into web