fixed nullPointer /
Merge branch 'master' of https://github.com/pcfascinated/Chatrix.git