Merge pull request #35 from diogodadalt/master

Adding nodetype field to node classes
...
Merge branch 'master' of http://github.com/lucaslazari/compiladores

Conflicts:
	etapa5/src/tree/vardeclarationnode.cpp
	etapa5/src/tree/vectordeclarationnode.cpp
Merge pull request #36 from diogodadalt/master

Scope and offset
endereçamento de variáveis
Merge branch 'master' of http://github.com/lucaslazari/compiladores

Conflicts:
	etapa5/src/scope.cpp
	etapa5/src/scope.h
	etapa5/src/tree/common.h
	etapa5/src/tree/node.cpp
	etapa5/src/tree/node.h
	etapa5/src/tree/vardeclarationnode.cpp
	etapa5/src/tree/vectordeclarationnode.cpp
ILOC on going