Updated README.md
Updated README.md
Added code templates.
Corrected tests.
Adjusted codetemplates.xml
Merge branch 'develop' into feature/enipedia,
to include adjusted code templates and corrected tests.