tweaks and merges
Merge branch 'master' of https://github.com/pagelines/Docs