Fixed problem with nested extends, removed auto-add of fields to nonterminals, fixed some type ambiguities
Merge branch 'master' of github.com:cwi-swat/rascal