Merge branch '83-Template-Element' into daily

Conflicts:
	ChangeLog.md
Closes #127. PageCode class names drop hypens.
Merge branch '127-UrlHandling' into daily
Merge branch 'next' into daily