fuck
Merge branch 'master' of https://github.com/eggine/Adolb

Conflicts:
	AdolbUI.pro.user
	MainWindow.cpp