Refactoring - improved error messages
Merge branch 'master' into dev

Conflicts:
	project2/src/Type/AG.ag