Merge pull request #65 from jamesyothers/master

updated whitelist for iOS
changed order of message and time of message on chats