Update composer lockfile
Add a git hook to automatically pull commits to master in
Merge branch 'develop'
Merge branch 'master' into develop