comment to new branch
Merge remote-tracking branch 'origin/new_branch'

Conflicts:
	src/ru/stn/IconChooserPane.java