improving cotsoc()
Add transport and main d'oeuvre
Adding some fonctionnaire cotsoc stuff
Parameters for civil servants : reorganisation

Adding some space for new parameters (feh& fccpa + pension taxes for
military forces)
TODO: complete the missing parameters (waiting for Simon...)
Merge pull request #5 from LouisePaulDelvaux/master

Add civil servants in param.xml
Fix conflict
Merge pull request #6 from MalkIPP/master

Parameters for civil servants : reorganisation
Fix conflict in cotsoc
Satrting to deal with CICE