Revert "Modified SCardConnect/SCardDisconnect logic to prevent more than one card from being connected to a context.  Trying to connect more than once to a context without doing a disconnect can cause a deadlock in the pcsclite daemon (pcscd)."

This reverts commit ed8ea297e790fd0e26e1a04148a3e6de2ea46dca.
Merged changes from awakecoding/master
Fixed merge issue with smartcard_pcsc.c
Merge branch 'master' of https://github.com/awakecoding/FreeRDP into awakecoding
Merge branch 'master' of https://github.com/awakecoding/FreeRDP into awakecoding
Merge branch 'awakecoding' of https://github.com/vworkspace/FreeRDP into awakecoding
Merge branch 'egfx' of https://github.com/awakecoding/FreeRDP into egfx
Initial implementation of H.264 decoder for MS-RDPEGFX
Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx

Conflicts:
	client/X11/xf_gfx.c