updated dependencies
updated version numbers
updated dependencies
updated translations
Merge branch 'master' into develop

Conflicts:
	composer.json
	composer.lock