Merge branch 'hotfix/hotfix1.2'
Fix iPad icons
Merge branch 'hotfix/iPadIcons' into develop