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'
Merge branch 'hotfix/block-event'
updated version numbers
updated seo description & keyword limit handling
build scss
Merge branch 'hotfix/seo'
updated composer
Merge branch 'master' of git://github.com/sulu-cmf/SuluContentBundle into hotfix/empty-block

Conflicts:
	Resources/public/dist/validation/types/block.js