Maj temps UC
Merge branch 'master' of https://github.com/4nthrx/subliminall-joomla

Conflicts:
	Documents/HeuresHomme.xls