refactoring to prepare for using Eclipse project information, and some bug fixes
Merge branch 'master' of github.com:cwi-swat/rascal