VP-66 File editor adapters
Merge remote-tracking branch 'upstream/develop' into feature/file

Conflicts:
	config/cms.config.php
	src/Vivo/CMS/UI/Content/Editor/File.php
Merge branch 'develop' of https://github.com/vivoportal/vivoportal into feature/file
VP-66 Vivo portal changes, adapters configuration, Default(general) resource adapter, Wysiwyg resource adapter, File rebuild
Merge branch 'develop' of https://github.com/vivoportal/vivoportal into feature/file
Merge branch 'develop' of https://github.com/vivoportal/vivoportal into feature/file
VP-66 - small code changes - comments etc..
Merge pull request #32 from vivoportal/feature/file

Feature/file