更新样式及添加字符图标
更新
gx
Merge branch 'branch_20131214' of https://github.com/xici/microassistant into branch_20131214

Conflicts:
	MicroAssistant/MicroAssistant.v11.suo