Merge branch 'master' into feature/posts
Add initial permalinks replacement
Merge branch 'feature/posts'