Ignore composer.lock file
Merge branch 'develop' into feature/tdd