Renamed glue templates
Added macro for required field mark
Renamed field templates to follow the pattern <action>-<field>-<any-qualifiers>.html