Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
07_invalides is now operationnal
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev

Conflicts:
	src/countries/france/data/erf/build_survey/03_fip.py
	src/countries/france/data/erf/build_survey/07_invalides.py
Merge pull request #263 from jsantoul/dev

Some minor changes and cleaning within data-grinder