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

Conflicts:
	SCMS-MVC/SCMS.suo