Continuing work on 04_famille
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Resyncronizing the data generation/treatment  files
Merge pull request #214 from jsantoul/dev

Modified datatable and pre_proc.py
Fix datatable and ongoing work on plus values
Merge pull request #215 from bouvard/dev

Dev
erreur date
error in date
Adding plus-values immo. Fixing some 2012 parameters
Hack to run France 2012
Improving capital taxation in france
Merge pull request #219 from benjello/dev

Improving capital taxation frace/cecilia
More stuff for Cecilia
Merge pull request #221 from benjello/dev

More stuff for Cecilia
modif param
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev

Conflicts:
	src/countries/france/param/param.xml
	src/scripts/cecilia.py
integration modif param Mahdi
ne pas merger
Revert "ne pas merger"

This reverts commit 089f7a556783a5809c3e0027129ece245781ba60.