File editor / adapter facelift (model properties: filename, ext, mimeType)
Merge branch 'develop' of https://github.com/vivoportal/vivoportal into develop

Conflicts:
	src/Vivo/CMS/UI/Content/Editor/File.php
Content File API
Fix file extension in upload method; added resource size in ini file
Merge branch 'develop' of https://github.com/vivoportal/vivoportal into develop
Merge pull request #71 from miroslavhajek/develop

File editor / adapter facelift