Merge pull request #204 from jsantoul/dev

Conversion of 03_fip still in progress.
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev