Merge branch 'release/1.2' into develop
Merge branch 'hotfix/hotfix1.2' into develop
Merge branch 'hotfix/iPadIcons' into develop
Version 1.2.1
Merge branch 'release/1.2.1'