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

Conflicts:
	src/dti/tdl/core/TestTDL.java