whitespace and formatting
Merge branch 'master' of github.com:thinkers/ts

Conflicts:
	master.xml