yucky partial commit... services slightly busto. Bringing in Victors stuff
Merge branch 'master' of github.com:chat-health/chat.android
fixed up the rest of Victors sync, changed flow on services branch for jim and lisa