Merge tag 'hotfix-1.2' into develop

fixed issues with merge
added jpeg comression option to gui
Merge branch 'jpeg-compression' into develop
Merge branch 'release-1.3'