commit to merge
merge w/ @benjello dev
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
cleaned 03_fip to remove some merges.
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
minor modifications of utilitaries
Merge branch 'dev'...

... of https://github.com/openfisca/openfisca into dev

Conflicts:
src/countries/france/data/erf/build_survey/08_final.py
attempt to remove duplicated pairs in 06_rebuild.

To be tested.
corrected duplicated pairs in 06_rebuild

Starting to debug 07_invalides
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Removing duplicated noindiv
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
debugging the prestation familiales.

To be completed
Debugging 04_famille still going on
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Some cleaning on 06_rebuild
Continuing the research of missing children
Cleaning simulation
Continuing the search for family subs bugs