attributeParsing in place; beginning testing
Merge remote-tracking branch 'upstream/Borel' into nvp
tokengroups absorbed into tokenmanager
Merge remote-tracking branch 'upstream/collaboration' into nvp
Merge remote-tracking branch 'upstream/collaboration' into nvp
merging upstream/collaboration changes
Merge remote-tracking branch 'upstream/collaboration' into nvp
Merge remote-tracking branch 'upstream/collaboration' into nvp
nvp compiles but is still **UNTESTED**
Fix alias resolution error that should really not be happening.
Merge branch 'nvp' of git://github.com/reolyze/Mogu into collaboration