improving cotsoc()
Add transport and main d'oeuvre
Adding some fonctionnaire cotsoc stuff
Fix conflict
Fix conflict in cotsoc