Merge branch 'master' into 1786-replace-jekyll-with-zenweb

diff --cc doc/admin/cheat_sheet.textile
Simple merge

diff --cc doc/api/resources.textile
Simple merge

diff --cc doc/api/schema/Link.textile
Simple merge

diff --cc doc/user/tutorials/running-external-program.textile
Simple merge

diff --cc doc/user/tutorials/tutorial-firstscript.textile
Simple merge