Merge pull request #228 from jsantoul/dev

conversion of 06_rebuild done. debug TBC
work on 08_final
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Merge pull request #229 from benjello/dev

work on 08_final
Fixing index/entity errors
Merge pull request #230 from benjello/dev

Fixing index/entity errors