Resolved FB emoticon problems to a large extent
OTR improvements, affects #443 and 505
Merge pull request #537 from gargsms/dev

Fix-for-issue-#463-and-future-others
Remove pointless console.log
Merge branch 'dev' of https://github.com/loqui/im into dev
This fixes #539
Merge pull request #540 from bobcanthelpyou/bugfixes

This fixes #539
fix for #544
Merge pull request #545 from TitanNano/fix

fix for #544