Merge branch 'production'
Merge branch 'production'
Remove Composer Lock
Merge branch 'master' into production
Merge pull request #8 from taqin/production

Production