used jquery-sort baranch and update dependencies
updated dependencies
Merge branch 'develop' into feature/jquery-sort

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

Conflicts:
	composer.json
	composer.lock
updated dependencies
updated dependencies
update dependencies
updated dependencies
updated dependencies
updated dependencies
Merge branch 'develop' into feature/jquery-sort

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

Conflicts:
	composer.json
	composer.lock
updated dependencies
minor style fix
updated dependencies
used php-cs fixer
updated dependencies
Merge branch 'develop' into feature/jquery-sort

Conflicts:
	bin/composer.phar
	composer.json
	composer.lock
updated dependencies