Template HTML fix
Add echo_call a Twig extension
Merge remote-tracking branch 'origin/master'