Name properties on conditional removed (and removed commented line)
Merge branch 'master' of https://github.com/feupeu/SW401F14-Xtext
Merge branch 'master' of https://github.com/feupeu/SW401F14-Xtext