Merge branch 'nvp' of git://github.com/reolyze/Mogu into collaboration
Merge branch 'nvp' of git://github.com/reolyze/Mogu into collaboration
Template 'currentToken' to specialize in either <int> or <MoguSyntax> for more readable usage.
Merge remote-tracking branch 'upstream/collaboration' into nvp