Update package.json
Update composer.json
Update composer.json
Update composer.json
Resolved merge conflicts.
Merge branch 'develop'
Updated people search dependency.
Merge branch 'master' into develop