增加半词条：[示波]器
增加词条：功力
增加词条：电平
Merge branch 'master' of https://github.com/zhang3/windows-7-wubi

Conflicts:
	TableTextServiceSimplifiedZhengMa.txt