Merge branch 'release/v1.2' into develop
fixed version number in Help, this is the released version 1.1 (build 4)
Merge branch 'develop'