Merge branch 'hotfix/1.3.3'
Import .travis.yml from develop
Increase robustness of submission saving when jpg files are submitted
Merge branch 'hotfix/1.3.4' into develop