some adds
Merge branch 'master' of https://github.com/Ivan-Zhukau/conforg-desktop.git

Conflicts:
	net.ostis.confman.ui/src/net/ostis/confman/ui/participant/RowSelectionListener.java