UPNP fixes
Merge remote-tracking branch 'tomp-master/master'
- basic frame of classes created