Adding nodetype field to node classes
Resolving conflicts
Merge pull request #35 from diogodadalt/master

Adding nodetype field to node classes