gengxin
Merge branch 'master' of https://github.com/xici/microassistant

Conflicts:
	MicroAssistant/MicroAssistant.v11.suo
	MicroAssistant/MicroAssistantMvc3/www/partials/sales/contract-edit.html