Merge branch 'hotfix/versionCode'
Fix Version Code
Merge branch 'master' into develop