11/19/14 pull
Merge branch 'develop' of https://github.com/RuiqingQiu/PredictionIO into develop

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