merged
Merge branch 'master' of https://github.com/cwi-swat/rascal.git

Conflicts:
	src/org/rascalmpl/library/experiments/Compiler/Examples/IMP1.rsc
	src/org/rascalmpl/library/experiments/Compiler/Examples/IMP2.rsc