templates ok (cleaned)
Merge branch 'master' into devel