delete src\reformes
src gitignore
Merge pull request #148 from AlexisEidelman/dev

better warning for missing col
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev

Conflicts:
	.gitignore
name error
new data sources
Merge pull request #154 from bouvard/dev

new data sources for 'Allocation logement"
12 avril : travail sur build agregate from source
12 avril  c2
Minor fix in script
15 avril
commit dev 15 avril
commit 2_15/04
Merge branch 'lolo_test' into dev
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