first commit
first commit
Merge remote-tracking branch 'origin/GMY_TS'

Conflicts:
	Web/Web.config
first commit
Merge remote-tracking branch 'origin/GMY_TS'
adds