Fix bug.
Merge branch 'master' of https://github.com/ProjectShepherd/Shepherd-android