clear up naming in Template
replaced inheritance with composition
Merge branch 'master' of https://github.com/ctrucza/Holiday