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