Cleaning nn ui
Merge branch 'master' into nn2

Conflicts:
	src/test/java/water/Sandbox.java
NN fixes & allow other types of output layers
GBMGrid fixes, processing argument sets in Request2
Merge branch 'nn2' into grids

Conflicts:
	src/main/java/hex/KMeans2.java
	src/main/java/hex/Layer.java
	src/main/java/hex/NeuralNet.java
	src/main/java/hex/Trainer.java
	src/main/java/water/Model.java
Progress on unified grid search && merged NN work
Proto of unified grid search
Merge branch 'master' into grids
Finished grid search, removed GBMGrid, fixed NN cols
Grid search launches one job at a time, fixed NN MR trainer
Fixed build
Merge branch 'master' into grids

Conflicts:
	src/main/java/hex/DPCA.java
Fixed for new job keys
Debugging tests
Merge branch 'master' into grids

Conflicts:
	src/main/java/hex/GBMGrid.java
	src/main/java/hex/gbm/DRF.java
	src/main/java/hex/gbm/DTree.java
	src/main/java/hex/gbm/GBM.java
	src/main/java/water/api/RequestServer.java
	src/test/java/hex/gbm/GBMTest.java
Merge branch 'grids'

Conflicts:
	src/main/java/water/api/GeneratePredictions2.java
Fixed GBM grid for Cliff's new version
Merge branch 'master' of git@github.com:0xdata/h2o.git

Conflicts:
	src/main/java/hex/gbm/DRF.java
	src/main/java/hex/gbm/GBM.java
	src/test/java/hex/gbm/GBMTest.java