Header expandable, hovers, conflicts
Merge branch 'master' of https://github.com/gabriel-dehan/silexcross-obelix