merge develop -D org -I include -E exclude: PR 22 (Fix headers of scripts to match coding standard. (rebase))