Templates refactoring
Merge branch 'master' of github.com:8manos/website