Fixed scoping yet again -.- FUSK
Merge branch 'master' of https://github.com/feupeu/SW401F14-Xtext