add support for disabling TCP Nagle algorithm
only generate UIDs for SOP Instances and Unknown types
Merge remote-tracking branch 'upstream/master'
Added .ide extension to ignore file
Merge branch 'master' into portable

Conflicts:
	.gitignore
Added dummy property to enable Windows Store building