Merge
Merge branch 'master' of https://github.com/pedroscocco/ToMat.git

Conflicts:
	ToMaT/ToMaT.pro.user
	ToMaT/main.qml