Fix ref to appforms template
Raw link for appforms template resolves incorrectly
Remove disused form templates, add 2x new
Merge master