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

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