Merge pull request #160 from benjello/dev

clean sync
IRPP sources data modification
Modif irpp2
aggregates from survey
csgd
Merge pull request #162 from bouvard/dev

Dev
Merge pull request #163 from benjello/dev

add adoption in france data
Merge pull request #166 from benjello/dev

upgrading inequality plugin
Data source modification in "cotisations_TousRegimes"
commit18/04/14h03
amounts.h5
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
test inequality
Merge pull request #168 from bouvard/dev

Dev
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev

Conflicts:
	src/scripts/aggregates_all_years.py