functions reorganisation

small fixes in naming
Portuguese templates
Merge branch 'master' of https://github.com/openEHR/openehr-website