added realtime message capabilites
resolved ip addresses in merge conflict