misc
Merge branch 'master' of https://github.com/rweigel/tsdsfe
Merge branch 'master' of https://github.com/rweigel/tsdsfe

Conflicts:
	tsdsfe.js