Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
07_invalides is now operationnal
fixing bug in "garantie de ressources"
modif in param
drop comments in param
Merge pull request #262 from bouvard/dev

Dev
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
Fixing conflicts