Migrated templates to separate .html files
Merge branch 'builder' of github.com:strummer/strummer into builder