Merge remote-tracking branch 'upstream/master'
Adding resize
Merge remote-tracking branch 'upstream/master'
Adding resize
Rebase with previous merges
Merge branch 'progressivedisplay' of https://github.com/ALouis38/ENPA into progressivedisplay

Conflicts:
	src/Innova/LearningPathBundle/Resources/public/css/style.css
Adding resize
Adding resize
Rebase with previous merges
Merge remote-tracking branch 'upstream/master'
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
Merge pull request #35 from ALouis38/progressivedisplay

Progressive Display
Adding "Operator" Entity
Fixtures
Merge pull request #42 from ALouis38/operator

Operator
add ajax save feature.
fix tree merge
Merge branch 'master' into fix_tree_merge

Conflicts:
	src/Innova/LearningPathBundle/Resources/views/Step/includes/list-item-pattern.html.twig
	src/Innova/LearningPathBundle/Resources/views/Step/includes/list-item.html.twig
Merge pull request #44 from arnaudbey/fix_tree_merge

Fix tree merge