Updated .gitignore to Include composer.lock

as required by Heroku
Merge branch 'dev-master'