summary
Merge branch 'master' of https://github.com/htomi/timetab
Merge branch 'master' of https://github.com/htomi/timetab
Merge branch 'master' of https://github.com/htomi/timetab

Conflicts:
	src/InfoServ/TimeTabBundle/Resources/views/Annex/summary_agreedcapfee.html.twig
excelbundle