Change permalink structure to pretty non .html
Update permalinks
Update link
Remove space from "website"
Merge branch 'release/6.1.0' into develop