Merge branch 'master' of https://github.com/yksoft/ykcms
Merge branch 'master' of https://github.com/yksoft/ykcms

Conflicts:
	YkCms/App_Data/YkCms.mdf
	YkCms/App_Data/YkCms_log.ldf