Server-side: diffReport
Merge remote-tracking branch 'origin/dev-diff' into dev-diff

Conflicts:
	src/main/java/ru/alvioneurope/canteen/web/controllers/ScalaReportController.scala
	src/main/java/ru/alvioneurope/canteen/web/services/ScalaReportService.scala