Fixed file upload error. Had to do with changed project root.
Merge branch 'fix_image_upload' into develop