Merge pull request #154 from bouvard/dev

new data sources for 'Allocation logement"
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
RMI+RSA in aggregates data from sources
rmi+rsa2
commit 15/04/16h34
job 15/04 16h39
Merge branch 'job_15_04' into dev

Conflicts:
	src/plugins/survey/aggregates.py
amounts.h5 15/04/17h00