..
Merge branch 'dev' of https://github.com/Clementp57/eLycee into dev
reinstall bower components
beginnig integration
fix conflicts