conflict commit
Merge branch 'stable' of https://github.com/RuiqingQiu/PredictionIO into stable

Conflicts:
	examples/scala-local-friend-recommendation/src/main/scala/FriendRecommendationEvaluator.scala
Merge branch 'stable' of https://github.com/RuiqingQiu/PredictionIO into stable
Merge branch 'stable' of https://github.com/RuiqingQiu/PredictionIO into stable

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