good!
Merge branch 'ZhangQi' of https://github.com/bg95/WhitePigeon into ZhangQi

Conflicts:
	WPWindow.cpp
	WPWindow.h
	WhitePigeon.pro.user
	mainwindow.cpp
	mainwindow.h