1
Merge branch 'master' of https://github.com/baoth/ReportDistributeProject

Conflicts:
	weixinreportviews/Controllers/Admin/AccountController.cs