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

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