Fix MPLY-5220 and MPLY-5200. Pair: Malc
Merge branch 'master' of github.com:eegeo/mobile-example-app