Merge branch 'master' of https://github.com/twostars/snoxd-koserver
Merge branch 'master' of https://github.com/katanatr/KOServer