Update with latest content changes
Merge branch 'content-structure' of https://github.com/timdegroote/3akai-ux into content-structure