fix the broken layout
Merge branch 'master' of github.com:Fsu0413/QSanguosha-For-Hegemony

Conflicts:
	src/dialog/configdialog.cpp
	src/main.cpp
Merge branch 'master' of github.com:Fsu0413/QSanguosha-For-Hegemony