Merge remote-tracking branch 'origin/patheditor'

Conflicts:
	src/Innova/LearningPathBundle/Resources/views/Step/pathEdit.html.twig
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Innova/LearningPathBundle/Resources/views/Step/pathEdit.html.twig
Adding select2 instead of typeahead
Merge pull request #29 from ALouis38/select2

Select2
Merge remote-tracking branch 'upstream/master'
add tree root attribute to tree li
Clonage avec css et icone
Adding icons in "Ressources réelles"
Merge pull request #30 from leovidal73/clonage

[WIP] Clonage avec css et icone
[WIP] Tree
Adding file input
Merge pull request #31 from ALouis38/filetype

Filetype
[WIP] Tree
cloning still buggy

Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Innova/LearningPathBundle/Controller/StepController.php
Merge pull request #32 from arnaudbey/master

[WIP] Tree
Merge remote-tracking branch 'upstream/master'
quick fix for root without specified path
Merge pull request #33 from arnaudbey/master

quick fix for root without specified path
Clonage, suppression (sans ajax), drag & drop