Merge origin/master

Conflicts:
	src/main/java/com/edwardraff/wekajsatbridge/WekaClassifier.java
	src/main/java/com/edwardraff/wekajsatbridge/WekaRegressor.java