Solve conflicts and fix #178
Solve conflicts and fix #178

openfisca/openfisca-matplotlib,openfisca/openfisca-qt,openfisca/openfisca-qt,adrienpacifico/openfisca-matplotlib,openfisca/openfisca-matplotlib