Merge branch 'master' of https://github.com/SebastianNiemann/ArmadilloJava

Conflicts:

test/src/arma/TestArmaScalarVectorValuedFunctionsOfVectorsMatricesLogic.
java
Fixed merge