fix web
Merge remote-tracking branch 'origin/master'

Conflicts:
	TSCD/App.config
	TSCD_GUI/App.config