Latest changes to TAP tool
Merge remote-tracking branch 'origin/tag1'

Conflicts:
	site/languages/en-GB/en-GB.com_ddctap.ini