Merge remote-tracking branch 'origin/gggmy' into wsq3

Conflicts:
	Web/Web.Publish.xml
Merge remote-tracking branch 'origin/gggmy' into wsq3
Merge remote-tracking branch 'origin/gggmy' into wsq3

Conflicts:
	Web/Web.Publish.xml
Merge remote-tracking branch 'origin/gggmy' into wsq3
Merge remote-tracking branch 'origin/gggmy' into wsq3
Merge remote-tracking branch 'origin/wsq3' into gggmy
adds