pastefromword option for content-type
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' of git://github.com/sulu-cmf/SuluContentBundle into feature/pastefromword
changed if statement
Merge pull request #218 from sulu-cmf/feature/pastefromword

[FEATURE] paste from word for text-editor
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
Merge branch 'develop' into feature/checkbox-content-type