Merge remote-tracking branch 'TG/master'

Conflicts:
	MvcApplicationExemplo.tg/MvcApplicationExemplo.tg.csproj
	UpgradeLog.XML
	UpgradeLog.htm