encoding
encoding
encoding
Merge remote-tracking branch 'origin/master'

Conflicts:
	Template_macros.txt
	makescript.ps1
Merge branch 'master' of https://github.com/vmouse/WebForm4

Conflicts:
	Template_macros.txt
	makescript.ps1
Revert "encoding"

This reverts commit 7c58d043d8553cf07466990b104a17f0058327a7.