Merge branch 'hotfix/1.0.2' into develop
Merge branch 'hotfix/1.0.3' into develop
fixed image uploads, hopefully
Merge branch 'release/1.0.4'