updating comparator
Fix conflict
Update + waterfall revisite

Possibility to begin by salbrut
reorganization of comparator FC
FC
Merge branch 'master' of https://github.com/MalkIPP/openfisca-taxipp-comparison

Conflicts:
	OpenFisca/comparator.py