Merge branch 'master' of https://github.com/thangnvaltplus/cakechat.git
Merge branch 'master' of https://github.com/thangnvaltplus/cakechat.git

Conflicts:
	Controller/ThreadsController.php