updated dependenciesZ
updated dependencies
updated dependencies
Merge branch 'develop' into feature/jquery-sort

Conflicts:
	composer.lock