Updated user module dependencies
Merge branch 'refs/heads/master' into release
Merge branch 'refs/heads/Released/beta5' into release

Conflicts:
	composer.json
Merge branch 'refs/heads/release'
Switching back to dev-master dependency