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

Conflicts:
	src/org/rascalmpl/library/experiments/CoreRascal/Translation/RascalExpression.rsc