Merge branch 'hotfix/session-refresh'
fixed missing parameter
Update composer.json
removed array to single vaue conversion
fixed for preview
fixed save button trigger
fixed container in init
fixed block selector for dropdown
Merge branch 'develop' into hotfix/smart-content-fikter

Conflicts:
	Content/Types/SmartContent/SmartContent.php
	composer.json
Merge branch 'hotfix/smart-content-fikter' into develop
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into develop