#336 fix
fixed tests
Hotfix for image uploads
Merge branch 'release' into develop