remake matrix
Merge branch 'master' of https://github.com/sebastianrahtz/oxgarage

Conflicts:
	Tests/Makefile
	doc/matrix.xml