Pull request conflicts #2
Merge branch 'develop' of https://github.com/mastergaurang94/PredictionIO into develop