Adding display categories
Merge branch 'Alessandro'

Conflicts:
	Projet1 - Brouillon/output_fns.php
Merge branch 'master' into Roberto