Storage Site Settings to Database
Merge branch 'master/master'
Merge branch 'master/master'
Media Image Editor
Merge branch 'master' of https://github.com/Tsingbo-Kooboo/CMS

Conflicts:
	Kooboo.CMS/Kooboo.CMS.Web/Styles/jQuery.jCrop/jquery.Jcrop.css