xsemantics
Merge branch 'master' of github.com:feupeu/SW401F14-Xtext

Conflicts:
	dk.sw401f14.tainc/src/dk/sw401f14/tainc/validation/TAInCValidator.xtend