Merge branch 'release/1.1.0'
bump versioncode
Merge branch 'hotfix/fix-versioncode' into develop