Merge branch 'release/1.6'
setup login
Merge branch 'release/1.7'
changed version code in manifest
Merge branch 'hotfix/1.7.1' into develop