Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
add backend remove feature
Merge pull request #41 from arnaudbey/master

add backend remove feature
Adding resize
Adding resize
Rebase with previous merges
In "Parcours", the selected path is now bold
Merge branch 'progressivedisplay' of https://github.com/ALouis38/ENPA into progressivedisplay

Conflicts:
	src/Innova/LearningPathBundle/Resources/public/css/style.css
	src/Innova/LearningPathBundle/Resources/public/js/script.js