添加操作人
Merge branch 'branch_20131214' of github.com:xici/microassistant into branch_20131214

Conflicts:
	MicroAssistant/MicroAssistant.v11.suo
Merge branch 'branch_20131214' of github.com:xici/microassistant into branch_20131214