refactored nag tree
Merge branch 'master' of github.com:Gluttonberg/core