Signed-off-by: lmaginot <mathieu@lalignemaginot.fr>
Merge branch 'master' of https://github.com/RobinDumontChaponet/synthese

Conflicts:
	src/models/Ancien.class.php
Merge branch 'master' of https://github.com/RobinDumontChaponet/synthese
Merge branch 'master' of https://github.com/RobinDumontChaponet/synthese
Merge branch 'master' of https://github.com/RobinDumontChaponet/synthese

Conflicts:
	src/models/Ancien.class.php

Signed-off-by: lmaginot <mathieu@lalignemaginot.fr>