Fix merge
Merge branch 'devel' of github.com:tkriik/etherchat into devel
Fix merge
Refactor WIP