销售机会修改
Merge branch 'master' of https://github.com/xici/microassistant
22
Merge branch 'master' of https://github.com/xici/microassistant

Conflicts:
	MicroAssistant/MicroAssistant.v11.suo
	MicroAssistant/MicroAssistantMvc/Areas/MarketingManagement/Controllers/MarketingController.cs