docs/src/Master*: fix merge errors
Merge branch 'docs-devel' of https://github.com/luminize/machinekit into docs-devel
docs: merge of /docs as subtree into Machinekit