Merge changes I8283a989,I64add89a into klp-dev

* changes:
  switch to use mat4
  vector and matrix classes for graphics use