lots of parser improvements
Merge branch 'refs/heads/master' of ssh://git@github.com/webgme/webgme.git