Histo reu et combat + futur combat

lol
Merge branch 'master' of https://github.com/STEREOH/UFCPPE

Conflicts:
	PDO/PdoConnect.php
Merge branch 'master' of https://github.com/STEREOH/UFCPPE

Conflicts:
	PDO/PdoConnect.php