merge develop -D org -I include -E exclude: PR 626 (Add new Squash tutorial and screenshots)
merge develop -D org -I include -E exclude: PR 652 (Improve server-template description in advanced configuration (rebased onto develop))