CHANGE: model Layout replaced by model Template
CHANGE: name of the template identifier changed from mock_template to sayyes_template
CHANGE: index update
CHANGE: undo template identifier
MERGE: mergin master
Merge branch 'master' into front-dev
CHANGE: new test files added