change via psr0-3
Merge branch 'master' of https://github.com/thangnvaltplus/cakechat.git

Conflicts:
	Controller/MessagesController.php