maj resources
Merge branch 'testLibre' of https://github.com/DEVINT2014-HUGO/HUGO into testLibre