fixing simulation
Merge pull request #246 from benjello/dev

fixing simulation
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Starting work on 02_imput_loyer
Merge pull request #247 from bouxtehouve/dev

Starting work on 02_imput_loyer
preliminary work on building 3 tables
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Instructions for @bouxtehouve
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Merge pull request #248 from benjello/dev

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