1.2.0
blad filtr
Merge remote-tracking branch 'origin/ver/1.2.0' into ver/1.3.0

Conflicts:
	app/pom.xml
	pom.xml
	web/pom.xml