Merge remote-tracking branch 'origin/123' into wsq2

Conflicts:
	EF/Initial.sql
Merge remote-tracking branch 'origin/123' into wsq2

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