template clean-up
Merge branch 'master' of github.com:clovis/PhiloLogic4