[ziziphus] - services/fixes/cleanup
Merge upstream/feature/generator-update into feature/generator-update

Conflicts:
	forms/AgentSet.xhtml
	forms/CulturalContextSet.xhtml
	forms/DateSet.xhtml
	forms/DescriptionSet.xhtml
	forms/InscriptionSet.xhtml
	forms/LocationSet.xhtml
	forms/MaterialSet.xhtml
	forms/MeasurementsSet.xhtml
	forms/RelationSet.xhtml
	forms/RightsSet.xhtml
	forms/SourceSet.xhtml
	forms/StateEditionSet.xhtml
	forms/StylePeriodSet.xhtml
	forms/SubjectSet.xhtml
	forms/TechniqueSet.xhtml
	forms/TextrefSet.xhtml
	forms/TitleSet.xhtml
	forms/WorktypeSet.xhtml
	record.html
[forms] - regenerated build
[recoed.html] - fixed merge
Merge pull request #161 from zwobit/feature/generator-update

Ziziphus latest fixes/cleanups