HomeWildfire Games

Merge entity templates, removing two templates with non descriptive names.