Merge pull request #51 from Osirium/bug/channel-enables

Bug/channel enables
vrplayer fixes
Merge branch 'master' of github.com:FreeRDP/xrdp
Merge branch 'master' of git://github.com/FreeRDP/xrdp into osirium2