Merge branch 'hotfix/v1.0.1'
Merge branch 'develop'
fixed ipad style formatting
Merge branch 'hotfix/v.1.0.2' into develop