param update (2)
Merge branch 'master' of https://github.com/bouvard/openfisca-france into bouvard-master

Conflicts:
	openfisca_france/param/param.xml
Accept file:/// URLs for legislation_url.
Remove EOL.
Replace ctx with state.
Remove non JSON date before converting dated legislation to JSON.
Add tree of columns.
Change handling of prenom and birth columns.
Fixinf cotsoc for fonction publique

Still some uncertainities for contractuel of fonction publique
Fix ars, benjamin and assiette foncier f4b
Comment on main d'oeuvre
Fix conflicting PR
Merge branch 'master' of https://github.com/openfisca/openfisca-france