test2 aangepast
Merge branch 'master' of https://github.com/Tnja92/VB---Chocolate

Conflicts:
	Code/Vertalerbouw/chocfiles/testDeclaratieVar.choc
	Code/Vertalerbouw/src/ContextualAnalyzer/IdEntry.java
Merge branch 'master' of https://github.com/Tnja92/VB---Chocolate