Updated Client and MainActivity
Merge branch 'master' of https://github.com/mtracy01/Databox