updated composer & lock file
Merge branch 'master' of github.com:phundament/app