Merge branch 'master' of https://github.com/openfisca/openfisca-france

Conflicts:
	openfisca_france/model/mini.py