SEA-90
Merge branch 'master' of E:\IdeaProjects\finder-play with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	console/app/my/finder/console/service/KPIService.scala
	console/app/my/finder/console/service/SummarizingService.scala
视图