fix #95
Merge branch 'master' into ui_testing
Added a 5-second pause before running tests
to make sure data loads first (in case of slow emulator/device)