Merge branch 'master' of https://github.com/wpawgasa/DTI-Link

Conflicts:
	derby.log
	tdldb/db.lck
	tdldb/log/log1.dat