prototype tree implementation progress
Merge branch 'develop' of https://github.com/zussel/oos.git into develop