Fix output of thinstation.conf.sample
	modified:   ts/5.2/build
Merge branch 'master' of ssh://github.com/Thinstation/thinstation
Merge branch 'master' into 5.2-Stable