Address #505(comment clean up), #510(back to chat after friend removal) and #518(QR Codes tox:// to tox:)
Merge branch 'fireflystorm-master'