merge
Merge branch 'master' of https://github.com/LadyNorm/chatitude
rectify mismatched sql