json.net
Merge branch 'master' of github.com:SeriaWei/EasyFrameWork

Conflicts:
	EasyFrameWork.CMS/Filter/WidgetAttribute.cs