乱码修改，时间选择bug修改
个人客户
Merge branch 'master' of https://github.com/xici/microassistant

Conflicts:
	MicroAssistant/MicroAssistant.v11.suo