Update composer.json
Merge branch 'develop'

Conflicts:
	composer.json
Merge branch 'develop'
fixed excerpt data loading
cleaned code
Merge branch 'hotfix/excerpt' into develop