Conflicts: ChangeLog htdocs/filefunc.inc.php htdocs/projet/activity/perweek.php htdocs/projet/element.php