Conflicts:
	app/models/dao/RankingDataExtractorOjsDao.scala

Conflicts:
	app/models/dao/RankingDataExtractorOjsDao.scala
ranking data extractor dao
Conflicts:
	app/models/dao/RankingDataExtractorOjsDao.scala