add back things on progress from the clean local version
Evaluator done
first type param removed
merge with official develop
Evaluator and Readme
Merge branch 'develop' of github.com:RuiqingQiu/PredictionIO into develop

Conflicts:
	examples/scala-local-friend-recommendation/README.md
	examples/scala-local-friend-recommendation/src/main/scala/FriendRecommendationEvaluator.scala
 parallel simrank
remove 3 stale files
Sampling data sources
markdown
Datasource and Datasourceparams added for evaluation
Merge branch 'stable' into develop
merge with stable and add back the Evaluator
extra folder deleted
eval.json added