Added composer.lock to .gitignore
Merge branch 'dev' of https://github.com/Coddict/CoddictDevExtraBundle into dev