More tree node work and group work
Merge branch 'master' of github.com:concrete5/concrete5