introducing variables that change the content depending on the select…

[CHMALU]

…ed template in the env

[majkelx]

The first thing is that OCATOM branch says:

This branch is 1 commit ahead of, 15 commits behind master.

That means, that the branch should be synchronized with master first, i.e. master have to be merged into OCATOM:

git checkout master
git pull
git checkout OCATOM
git merge master

this will:

• update your copy of master branch to the latest version,
• switch back to OCATOM as an active branch,
• merge recent changes from master to your branch

as a result OCATOM should be ahead of master by one yours commit.