aaa
Correction partiel du TP
Merge branch 'eric' of https://github.com/sferey/TchatCared2.git into eric
Merge remote-tracking branch 'remotes/origin/eric'

Conflicts:
	src/application/controllers/ReadTchatController.php
	src/application/controllers/SendTchatController.php
	src/application/models/User.php
	src/application/views/readtchat.phtml
Merge branch 'master' into Eric

Conflicts:
	Rappel_pour_ZAK.md