Calender Type Setup
Merge branch 'master' of github.com:khwwas/SCMS

Conflicts:
	SCMS-MVC/SCMS.suo
	SCMS-MVC/SCMS/Views/Shared/SCMSMaster.Master
	SCMS-MVC/SCMSDataLayer/DB/SCMS.dbml
	SCMS-MVC/SCMSDataLayer/DB/SCMS.dbml.layout
	SCMS-MVC/SCMSDataLayer/DB/SCMS.designer.cs
	SCMS-MVC/SCMSDataLayer/Properties/Settings.Designer.cs
	SCMS-MVC/SCMSDataLayer/Properties/Settings.settings
Calender Type Setup