VP-144 UI Components added from init() methods must be initialized
manually
Merge pull request #25 from dlu-gs/refact/ui-component-init

VP-144 UI Components added from init() methods must be initialized
Merge pull request #24 from zstanek/develop

update of def navigation template
VP-148 WIP
VP-144 bug fix (components removed in init() are not initialized any more)
Merge pull request #26 from dlu-gs/hotfix/contenttype

Hotfix/contenttype
VP-109 Support for custom content container templates
Merge pull request #27 from dlu-gs/feature/layout-logical-contents

VP-109 Support for custom content container templates
VP-66 Content editor adapters
Merge pull request #28 from dlu-gs/feature/content-adapters

VP-66 Content editor adapters
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
VP-109 Refactored to component container template
VP-109 Minor clean-up
Merge pull request #29 from dlu-gs/feature/layout-logical-contents

Feature/layout logical contents
Fix merging file uploads with query and post params in AbstractForm
Merge pull request #30 from dlu-gs/hotfix/uploads

Fix merging file uploads with query and post params in AbstractForm
Merge branch 'develop' of https://github.com/vivoportal/vivoportal into feature/file
VP-105 Overview Expandable
Merge pull request #31 from dlu-gs/feature/overview-expandable

VP-105 Overview Expandable