MA - Commit
MA - Commit
Commit Changes
Merge branch 'master' of github.com:khwwas/SCMS

Conflicts:
	SCMS-MVC/SCMS.suo
	SCMS-MVC/SCMS/bin/SCMS.dll
	SCMS-MVC/SCMS/bin/SCMS.pdb
	SCMS-MVC/SCMS/bin/SCMSDataLayer.dll
	SCMS-MVC/SCMS/bin/SCMSDataLayer.pdb
	SCMS-MVC/SCMS/obj/Debug/SCMS.dll
	SCMS-MVC/SCMS/obj/Debug/SCMS.pdb
	SCMS-MVC/SCMSDataLayer/bin/Debug/SCMSDataLayer.dll
	SCMS-MVC/SCMSDataLayer/bin/Debug/SCMSDataLayer.pdb
	SCMS-MVC/SCMSDataLayer/obj/Debug/SCMSDataLayer.dll
	SCMS-MVC/SCMSDataLayer/obj/Debug/SCMSDataLayer.pdb