Issue #561 - added grouping
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_v1

Conflicts:
	src/PrizmMainProject/Properties/Resources.resx
Merge branch 'master' of https://github.com/olga-jane/prizm into Protsenko_v1

Conflicts:
	src/PrizmMainProject/Properties/Resources.resx
Merge pull request #582 from olga-jane/Protsenko_v1

Audit issue