placeholder
Merge branch 'ALouis38/draganddrop'

Conflicts:
	app/partials/tree-item.html