ts gateway support
ts gateway support
Merge branch 'tsg1'
Merge branch 'master' of tls01:/home/git/sw/NeutrinoRDP

Conflicts:
	libfreerdp-core/rdp.c
Merge branch 'master' of github.com:neutrinolabs/NeutrinoRDP

Conflicts:
	libfreerdp-core/nego.c