Lock in orientation.
Better email handling.
Merge remote-tracking branch 'origin/In-progress'
Merge branch 'master' of https://github.com/Omnimaga/bugs