Merge branch 'develop'
updated composer
added sort order
Merge branch 'hotfix/smart-content-sort' into develop