fix
Merge branch 'develop' of github.com:RuiqingQiu/PredictionIO into develop

Conflicts:
	examples/scala-local-friend-recommendation/src/main/scala/FriendRecommendationEvaluator.scala