Conflict
Merge branch 'master' of https://github.com/christophetd/hackathon
Merge branch 'master' of https://github.com/christophetd/hackathon
Merge branch 'master' of https://github.com/christophetd/hackathon
Merge branch 'master' of https://github.com/christophetd/hackathon
Sources + generic main