fixed, still need to fix conform params error
Merge branch 'develop' of github.com:RuiqingQiu/PredictionIO into develop