Grid fix
Merge branch 'master' of https://github.com/lashchenko/DroidMotionChat.git