1
Merge branch 'master' of github.com:ooosniper/info_platform_i

Conflicts:
	Mis.Web/Mis.Web.csproj