tableau json
Merge remote-tracking branch 'upstream/master'
Merge pull request #17 from leovidal73/master

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

Conflicts:
	src/Innova/AppBundle/Controller/WorkspaceManagerController.php