Fixed "//" causing path addition test to fail
Merge branch 'master' of github.com:cwi-swat/rascal

Conflicts:
	src/org/rascalmpl/library/lang/rascal/tests/basic/Locations.rsc