Too lazy to explain
Merge branch 'feature/NewTreeView' of https://github.com/pandorafms/pandorafms into feature/NewTreeView

Conflicts resolved:
	pandora_console/include/javascript/tree/TreeController.js