更新
Merge branch 'branch_20131214' of https://github.com/xici/microassistant into branch_20131214
更新
Merge branch 'branch_20131214' of https://github.com/xici/microassistant into branch_20131214

Conflicts:
	MicroAssistant/MicroAssistant.v11.suo