Updated timeouts for app-level demonstration
Merge branch 'master' of https://github.com/Ommac/RBDemo