Merge branch 'release/v1.0' into develop
Merge branch 'hotfix/v1.0.1' into develop
additional style adjustments for iPhone
Merge branch 'develop'