merged newest version, new tree system

Signed-off-by: Marcel Koerbler <marcel.koerbler@htl-klu.at>