PDIO-62 #comment in-progress update of using AlgoInfo in adminServer
Merge branch 'master' of github.com:PredictionIO/PredictionIO

Conflicts:
	commons/src/main/scala/io/prediction/commons/settings/code/CodeAlgoInfos.scala