Prepare for rotation support
Merge branch 'master' of https://github.com/themokaproject/moka-app