Merge origin/master

Conflicts:
	src/InfoServ/TimeTabBundle/Admin/AnnexAdmin.php
	src/InfoServ/TimeTabBundle/Entity/Annex.php