Modality namespace for Droid reshuffle.
Merge branch 'unify_controllers' of github.com:eegeo/mobile-example-app into unify_controllers