added composer.lock to gitignore
Merge branch 'composer' into staging