Still importing from CVS
final
no message
Merge branch 'master' of https://github.com/optimatika/ojAlgo

Conflicts:
	.gitignore
	build.properties
	src/org/ojalgo/netio/Batch.java
	src/org/ojalgo/optimisation/ExpressionsBasedModel.java