merging
Merge branch 'master' of ssh://github.com/huggle/huggle3-qt-lx

Conflicts:
	huggle/core.cpp
	huggle/core.h