Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Work on 03_fip done

Testing is pending.
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
03_fip now compatible w/ new class organization
Merge pull request #209 from jsantoul/dev

File 03_fip is now done