Server-side: diffReport
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
Server-side: diffReport
Merge remote-tracking branch 'origin/dev-diff' into dev-diff

Conflicts:
	src/main/java/ru/alvioneurope/canteen/domain/repo/report/AmountReportsDao.java
Server-side: diffReport
Server-side: diffReport
Server-side: diffReport
Merge remote-tracking branch 'origin/dev-diff' into dev-diff

Conflicts:
	src/main/java/ru/alvioneurope/canteen/domain/repo/report/AmountReportsDao.java
Server-side: diffReport docs
diff report ui
Merge remote-tracking branch 'origin/dev-diff' into dev-diff
Server-side: diffReport fix
Merge remote-tracking branch 'origin/dev-diff' into dev-diff
Server-side: diffReport fix
Merge remote-tracking branch 'origin/dev-diff' into dev-diff
diff report fixes
Merge branch 'dev-diff' into dev