improving cotsoc()
Add transport and main d'oeuvre
Add scalebarem() csgchom
Merge branch 'master' of https://github.com/openfisca/openfisca-france
Merge pull request #4 from MalkIPP/master

Taxes on transportation and workforce
Adding some fonctionnaire cotsoc stuff
Merge branch 'master' of https://github.com/openfisca/openfisca-france
Traitements des fonctionnaires

TO DO:
introduire : "Le traitement brut mensuel d'un agent public ne peut être
inférieur à celui correspondant à l'indice majoré 309"
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...)
CICE and rename "main-d-oeuvre"
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