add front-end removing step feature
Add credits
Merge pull request #1 from purplefish32/trash4tree

Add credits
add front-end removing step feature
Add credits
Merge branch 'trash4tree' of github.com:arnaudbey/ENPA into trash4tree
Fixing "delete function" issue
Merge pull request #17 from leovidal73/master

tableau json
Merge pull request #2 from ALouis38/trash4tree

Trash4tree
test
test
fix issue. now correctly hide parent trash icon when hovering a child
Merge branch 'trash4tree'

Conflicts:
	src/Innova/AppBundle/Controller/WorkspaceManagerController.php
fix trash4tree
Merge remote-tracking branch 'upstream/master'
correction du js qui permettait de delete des step dans le volet de droite
Merge pull request #18 from arnaudbey/step2trash

correction du js qui permettait de delete des step dans le volet de droi...
Composer update, move LearningPathBundle to src
Merge branch 'movevendor'
Merge remote-tracking branch 'upstream/master'