separate header from  templates
Merge branch 'master' of https://github.com/welsen/elsaa