Moved scoping and naming to right classes, and corrected stuff
Merge branch 'master' of https://github.com/feupeu/SW401F14-Xtext