Update composer.json
Merge branch 'develop'
Added dependency to twig
Merge branch 'master' into develop