test du tchat
Merge branch 'master' of https://github.com/ORETI/ORETI

Conflicts:
	includes/header.php
	js/tchat.js
	tchat.php
	tchatAjax.php