Merge branch 'ericleretour' of https://github.com/sferey/TchatCared2.git
into ericleretour

Conflicts:
	src/application/controllers/RefreshTchatController.php
Merge branch 'ericleretour' of https://github.com/sferey/TchatCared2.git
into ericleretour