fixed in templates
Merge branch 'master' of https://github.com/solin/esco2014