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

Conflicts:
	MicroAssistant/MicroAssistant.Meta/CustomerEnt.cs
	MicroAssistant/MicroAssistant.Meta/CustomerPrivate.cs
	MicroAssistant/MicroAssistant.v11.suo
	MicroAssistant/MicroAssistantMvc/App_Start/FilterConfig.cs
	MicroAssistant/MicroAssistantMvc/Areas/MarketingManagement/Controllers/MarketingController.cs
	MicroAssistant/MicroAssistantMvc/Filters/LogFilterAttribute.cs
	Prototype/浜у搧绠＄悊_files/data.js