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
changed iterator to stream
Update README.md
Update README.md
readme updated input and output files for file_random
updated
readme updated
file random added mini_rec_log_train
uncommented
Merge branch 'stable' of https://github.com/RuiqingQiu/PredictionIO into stable

Conflicts:
	examples/experimental/scala-local-friend-recommendation/src/main/scala/FriendRecommendationEvaluator.scala
update and test thoroughly
Merge branch 'stable' of https://github.com/RuiqingQiu/PredictionIO into stable
Merge branch 'stable' into develop
merge with stable and add back the Evaluator