Modified throw for invalid constructor and production additions, converted into scope error
Merge conflict fixed
Merge branch 'master' of github.com:cwi-swat/rascal