Added changes for when app is in background
Merge branch 'master' of https://github.com/Z-Home/capstone