fixes
Fixes #393
Merge pull request #398 from Gioyik/console

fixes
Fix #391
Merge #397
Merge branch 'Gioyik-fix#393' into dev
Fix #181
Merge branch 'XMPP-FTW' into dev
Better solution for #391
Merge branch 'XMPP-FTW' into dev
Merge branch 'dev' into xmpp-muc