am 9b5534b0: Merge changes I8283a989,I64add89a into klp-dev

* commit '9b5534b0e5e1510f56e6a2c58ad0816167603ebd':
  switch to use mat4
  vector and matrix classes for graphics use