updated composer.json
updated configurations
updated composer.json
added nested set for news category
updated cofiguration
updated composer.json
Merge branch 'origin/2.3'

Conflicts:
	composer.json