modified:   HarpsInterface/configuration.cpp
	modified:   HarpsInterface/configuration.h
	modified:   HarpsInterface/globals.h
	modified:   HarpsInterface/idictionary.h
	modified:   HarpsInterface/main.cpp
	modified:   HarpsInterface/settingpanel.cpp
Merge branch 'master' of https://github.com/ZhangBowen/Harps_interface

Conflicts:
	HarpsInterface/settingpanel.cpp

	modified:   HarpsInterface/settingpanel.cpp
	modified:   HarpsInterface/HarpsInterface.pro
	modified:   HarpsInterface/configuration.cpp
	modified:   HarpsInterface/configuration.h
	modified:   HarpsInterface/globals.h
	modified:   HarpsInterface/harps.cpp
	modified:   HarpsInterface/harps.h
	modified:   HarpsInterface/iactions.h
	modified:   HarpsInterface/iconvertor.h
	modified:   HarpsInterface/idictionary.h
	modified:   HarpsInterface/ispeller.h
	modified:   HarpsInterface/main.cpp
	modified:   HarpsInterface/settingpanel.cpp
	modified:   HarpsInterface/settingpanel.h
	HarpsInterface/candidatepanel.cpp
	HarpsInterface/candidatepanel.h
	HarpsInterface/stdafx.cpp
	HarpsInterface/stdafx.h
	configs/