matrix class improvement
matrix class improvement
Merge origin/master

Conflicts:
	geometry/vector.h
	nbproject/private/private.xml