Merge branch 'master' into develop
Fix routing (remove route in annotation and add in routing.yml)
Add category link in navigation
Merge branch 'develop'