conf
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ru/croacker/lbutil/ui/MainFrame.java
conf