iPhone 5 bug fixes
Merge branch 'master' of https://github.com/carbamide/Einstein