Improved template and snippet handling
Merging html5 plugin and function mods with template and snippet improvements`