fixed scaling issue with iPhone 6 plus
Merge branch 'master' into jailbreak