Bugfixes.
Controller code organised.
iPhone 4/4s fix.
Merge branch 'master' of https://github.com/iodie/mappedinisrael