Merge branch 'develop'
updated composer
added sort order
fixed translations
added build file
fixed sulu-cmf/sulu-standard#292
added order by default test
Merge branch 'hotfix/smart-content-sort'
Merge branch 'hotfix/smart-content-sort' into develop
Merge branch 'hotfix/smart-content-sort'
Merge branch 'hotfix/smart-content-sort' into develop
Merge branch 'hotfix/block-event'
Merge branch 'hotfix/block-event' into develop
resetted composer dependencies
Merge branch 'master' of git://github.com/sulu-cmf/SuluContentBundle into develop
updated version numbers
updated seo description & keyword limit handling
build scss
Merge branch 'hotfix/seo'
Merge branch 'hotfix/seo' into develop

Conflicts:
	composer.json