resolve merge
Merge branch 'eval' of https://github.com/RuiqingQiu/PredictionIO into eval

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