Merge
Merge branch 'master' of
https://github.com/JoostvDoorn/VertalerbouwEindproject.git

Conflicts:
	src/alia/AliaCodeGeneratorStringTemplate.g