Merge remote-tracking branch 'origin/A'

Conflicts:
	NetTicketOut.dpr
	NetTicketOut.dproj
	home.pas
Merge branch 'master' of https://github.com/byrdkm17/NetTicketOut

Conflicts:
	home.pas