stupid detached head
moved templates to the right place
Merge branch 'template_fix'