Merge branch 'master' into k-means-grid

Conflicts:
	src/main/java/water/H2O.java
	src/main/java/water/Weaver.java
	src/main/java/water/api/Inspect2.java
	src/main/java/water/api/Parse2.java
	src/main/java/water/api/RequestServer.java