完成公式编辑界面设计
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	NXJCSlim/NXJC.Slim.Service/bin/Debug/NXJC.Slim.Service.dll
	NXJCSlim/NXJC.Slim.Service/bin/Debug/NXJC.Slim.Service.pdb
	NXJCSlim/NXJC.Slim.Service/obj/Debug/NXJC.Slim.Service.dll
	NXJCSlim/NXJC.Slim.Service/obj/Debug/NXJC.Slim.Service.pdb
	NXJCSlim/NXJC.UI.Web/bin/NXJC.Slim.Service.dll
	NXJCSlim/NXJC.UI.Web/bin/NXJC.Slim.Service.pdb
	NXJCSlim/NXJC.UI.Web/bin/NXJC.UI.Web.dll
	NXJCSlim/NXJC.UI.Web/bin/NXJC.UI.Web.pdb
	NXJCSlim/NXJC.UI.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	NXJCSlim/NXJC.UI.Web/obj/Debug/NXJC.UI.Web.csprojResolveAssemblyReference.cache
	NXJCSlim/NXJC.UI.Web/obj/Debug/NXJC.UI.Web.dll
	NXJCSlim/NXJC.UI.Web/obj/Debug/NXJC.UI.Web.pdb
	NXJCSlim/NXJCSlim.v11.suo