APD-579: object tree js various improvements
Merge branch 'APD-579' into develop

Conflicts:
	web-app/js/objects.js