Merge branch 'master' of github.com:thondo/qtplatz

Conflicts:
	src/adplugins/qtwidgets/peakmethodform.ui