revert merge commit, incorporate changes
revert merge commit, incorporate changes

jasonchaffee/PredictionIO,indranig/PredictionIO,shimamoto/incubator-predictionio,clemp6r/PredictionIO,clemp6r/PredictionIO,alex9311/PredictionIO,jingyidata/PredictionIO,ch33hau/PredictionIO,BojianLi/PredictionIO,akaash-nigam/PredictionIO,wenaz/PredictionIO,atyenoria/PredictionIO,akaash-nigam/PredictionIO,skmezanul/PredictionIO,Ribeiro/PredictionIO,BuildAPE/PredictionIO,indranig/PredictionIO,clemp6r/PredictionIO,Emaasit/PredictionIO,Ribeiro/PredictionIO,himanshudhami/PredictionIO,himanshudhami/PredictionIO,jasonchaffee/PredictionIO,atyenoria/PredictionIO,indranig/PredictionIO,zafarella/PredictionIO,adamharish/PredictionIO,beni55/PredictionIO,jasonchaffee/PredictionIO,indranig/PredictionIO,ionux/PredictionIO,hsavit1/PredictionIO,Ribeiro/PredictionIO,BojianLi/PredictionIO,doron123/PredictionIO,cristiancrc/PredictionIO,akaash-nigam/PredictionIO,pferrel/PredictionIO,rbo7nik/PredictionIO,michaelshing/PredictionIO,atyenoria/PredictionIO,skmezanul/PredictionIO,EmergentOrder/PredictionIO,shimamoto/incubator-predictionio,tuxdna/PredictionIO,codingang/PredictionIO,elkingtonmcb/PredictionIO,net-shell/PredictionIO,takezoe/incubator-predictionio,takezoe/incubator-predictionio,sevenihust/PredictionIO,beni55/PredictionIO,stephen-corgiat/PredictionIO,takeshineshiro/PredictionIO,tuxdna/PredictionIO,shimamoto/incubator-predictionio,adamharish/PredictionIO,hsavit1/PredictionIO,wangmiao1981/PredictionIO,atyenoria/PredictionIO,elkingtonmcb/PredictionIO,takeshineshiro/PredictionIO,takezoe/incubator-predictionio,schon/PredictionIO,arudenko/PredictionIO,adamharish/PredictionIO,djeraseit/PredictionIO,akaash-nigam/PredictionIO,rsganesh83/PredictionIO,druzbikova/PredictionIO,shimamoto/incubator-predictionio,dszeto/incubator-predictionio,djeraseit/PredictionIO,tuxdna/PredictionIO,rbo7nik/PredictionIO,marevol/incubator-predictionio,ionux/PredictionIO,Ribeiro/PredictionIO,codingang/PredictionIO,BojianLi/PredictionIO,codingang/PredictionIO,biddyweb/PredictionIO,mars/incubator-predictionio,stephen-corgiat/PredictionIO,jingyidata/PredictionIO,initChan/PredictionIO,ch33hau/PredictionIO,Emaasit/PredictionIO,thiagoveras/PredictionIO,sekaiamber/PredictionIO,takezoe/incubator-predictionio,rsganesh83/PredictionIO,michaelshing/PredictionIO,ch33hau/PredictionIO,arudenko/PredictionIO,zafarella/PredictionIO,pferrel/PredictionIO,jlegendary/PredictionIO,marevol/incubator-predictionio,PredictionIO/PredictionIO,codingang/PredictionIO,BuildAPE/PredictionIO,BuildAPE/PredictionIO,tastatur/PredictionIO,doron123/PredictionIO,druzbikova/PredictionIO,PredictionIO/PredictionIO,b-cuts/PredictionIO,prmdsharma/PredictionIO,himanshudhami/PredictionIO,codingang/PredictionIO,akaash-nigam/PredictionIO,net-shell/PredictionIO,Emaasit/PredictionIO,beni55/PredictionIO,rsganesh83/PredictionIO,biddyweb/PredictionIO,net-shell/PredictionIO,dszeto/incubator-predictionio,prmdsharma/PredictionIO,sekaiamber/PredictionIO,schon/PredictionIO,initChan/PredictionIO,Ribeiro/PredictionIO,dszeto/incubator-predictionio,druzbikova/PredictionIO,net-shell/PredictionIO,marevol/incubator-predictionio,prmdsharma/PredictionIO,atyenoria/PredictionIO,doron123/PredictionIO,tastatur/PredictionIO,stephen-corgiat/PredictionIO,schon/PredictionIO,hsavit1/PredictionIO,pferrel/PredictionIO,mars/incubator-predictionio,net-shell/PredictionIO,jingyidata/PredictionIO,alex9311/PredictionIO,doron123/PredictionIO,cristiancrc/PredictionIO,jlegendary/PredictionIO,jlegendary/PredictionIO,mars/incubator-predictionio,b-cuts/PredictionIO,wangmiao1981/PredictionIO,djeraseit/PredictionIO,sevenihust/PredictionIO,cristiancrc/PredictionIO,PredictionIO/PredictionIO,prmdsharma/PredictionIO,wenaz/PredictionIO,takeshineshiro/PredictionIO,prmdsharma/PredictionIO,sevenihust/PredictionIO,biddyweb/PredictionIO,tastatur/PredictionIO,EmergentOrder/PredictionIO,elkingtonmcb/PredictionIO,jlegendary/PredictionIO,skmezanul/PredictionIO,arudenko/PredictionIO,wenaz/PredictionIO,initChan/PredictionIO,jlegendary/PredictionIO,mars/incubator-predictionio,marevol/incubator-predictionio,wangmiao1981/PredictionIO,thiagoveras/PredictionIO,michaelshing/PredictionIO,BojianLi/PredictionIO,EmergentOrder/PredictionIO,indranig/PredictionIO,rbo7nik/PredictionIO,doron123/PredictionIO,dszeto/incubator-predictionio,alex9311/PredictionIO,zafarella/PredictionIO,thiagoveras/PredictionIO,ionux/PredictionIO,BojianLi/PredictionIO,sekaiamber/PredictionIO,himanshudhami/PredictionIO,b-cuts/PredictionIO