Merge branch 'develop'

Conflicts:
	composer.lock
updated requirements
Merge branch 'master' into feature/jquery-sort

Conflicts:
	composer.json
	composer.lock