Merge branch 'master' of https://github.com/ariatemplates/documentation-code