settings, MainWindow, DockWidget
Merge branch 'master' of https://github.com/MrLeeh/articlefinder

Conflicts:
	articlefinder/qt/mainwindow.py