Merge remote-tracking branch 'origin/master' into wsq_1

Conflicts:
	Entity/Entity.csproj
Merge remote-tracking branch 'origin/master' into wsq_1

Conflicts:
	Entity/Entity.csproj
Merge remote-tracking branch 'origin/gggmy' into wsq3

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

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

Conflicts:
	Web/Web.Publish.xml
adds