Merge branch 'hotfix/1.1.5' into develop
Many fixes.
Updated qrc
Merge branch 'release/1.2.0'