slick integratio
slick integration
Merge branch 'master' into slick-integration

Conflicts:
	app/models/dao/RankingDataExtractorOjsDao.scala
slick integration +  RankigDataExtractorOjsDao example
slick integration +  RankigDataExtractorOjsDao example
Merge remote-tracking branch 'origin/slick-integration' into slick-integration
Merge pull request #15 from tilius/slick-integration

Slick integration