cleanup
Merge branch 'multi-scene-refactor' of github.com:guardianproject/mrapp into multi-scene-refactor