Merge branch 'develop'
Hotfix. Change url in twig template
Merge branch 'master' into develop
Fix routing (remove route in annotation and add in routing.yml)