Added help text and tag editor.
Merge remote-tracking branch 'origin/master'

Conflicts:
	generator.htm