Merge branch 'dev'
Fixed kick command (room argument has been removed)