shift modifications
Merge branch 'scms-sk' into scms

Conflicts:
	SCMS-MVC/SCMS.suo
	SCMS-MVC/SCMSDataLayer/DB/SCMS.dbml
	SCMS-MVC/SCMSDataLayer/DB/SCMS.dbml.layout
	SCMS-MVC/SCMSDataLayer/DB/SCMS.designer.cs