modif rapport
Merge branch 'master' of github.com:zirby/TC005

Conflicts:
	admin/rapport.php
conflict solved
rapport fin