bumped version to 1.2
Merge branch 'release-1.5'
Merge branch 'release-1.5' into develop
bumped to 1.2.1
Merge branch 'hotfix-1.2.1' into develop