Renamed Matrix files.
Fixed Matrix constructor ambiguity.
Renamed Matrix to Matrix4.
Merge branch 'master' into development