Refactoring and stuff. No feature changes.
Merge branch 'master' of https://github.com/ParisMi/ChatMenuAPI