Updated javadoc
Merge branch 'master' of https://github.com/18107/Matrix.git