Several bugfixes and event onclick of tree nodes
Upload the last changes
Merge branch 'APD-497-UGO' into develop