More templates

- resolve conflitos
Merge pull request #2 from objectos/moe_02_templates

MOE_02: Templates