Merge pull request #171 from bouvard/dev

Dev
DEBUG for cotsoc : prelsoc added
Merge pull request #174 from benjello/dev

DEBUG for cotsoc : prelsoc added
VArious fix. Work on erf
Merge branch 'dev' of https://github.com/openfisca/openfisca into dev
Merge pull request #177 from bouvard/dev

Dev
Fix minor bug
Solve conflicts and fix #178
Merge pull request #179 from benjello/dev

Minor bugs and psa
Refactoring Cols
Creating France tests. Starting with pfam
Merge pull request #182 from benjello/dev

France tests