Add parsing error to the exception system
Fix matrix detection
Add matrix parsing
Merge branch 'master' of https://github.com/ALabate/utt-nf05-project

Conflicts:
	build-utt-nf05-project-Desktop-Debug/utt-nf05-project