- fix CkEditor Image/File Browser plugin to include rootfolder, and allow uploads to it (but don't allow the root folder to be deleted or renamed)
Merge branch 'develop'

Conflicts:
	RockWeb/Blocks/Utility/CkEditorFileBrowser.ascx.cs