added id to Util function so that it can work with createOrUpdate
Merge branch 'master' of github.com:chat-health/chat.android