Fixes
Merge branch 'master' of https://github.com/vripoche/hackathon
Fixe conflict inserts
Merge branch 'master' of https://github.com/vripoche/hackathon