updated app and mock app
Merge branch 'master' of github.com:rit-sse-mycroft/tools