1
1
Merge branch 'master' of https://github.com/Novthirteen/sih-les

Conflicts:
	.gitignore
	src/SI.5.0.0/Web.SI/Config/properties.config
	src/SI.5.0.0/Web.SI/Web.SI.Publish.xml
	src/WebApp.5.0.0/WebApp/Controllers/ORD/InMiscOrderController.cs
	src/WebApp.5.0.0/WebApp/Controllers/ORD/OutMiscOrderController.cs
	src/WebApp.5.0.0/WebApp/Views/com.Sconit.Web.Controllers.ORD/OutMiscOrder/New.cshtml
	src/WebApp.5.0.0/WebApp/WebApp.Publish.xml
	src/WebApp.5.0.0/WebApp/WebApp.csproj