make locale mandatory in url
Merge branch 'features/simplify_routing' into releases/v1.5.0