fixed compilation issues
Merge branch 'refactor-subtype' of git@github.com:cwi-swat/rascal.git
into refactor-subtype

Conflicts:
	src/org/rascalmpl/library/util/Eval.java