Filmon PVR

XBMC Filmon PVR addon. Supports live TV, recordings, EPG. Requires a Filmon subscription. Before enabling: (a) in Filmon set channels as favourite to see them in XBMC (b) enter your username and password in this addon's settings. Note: recordings can take several minutes to appear after timer is completed.

Depends on jsoncpp, cryptopp, libcurl.
nope, that didn't work ;-)
you need to resolve the conflicts that are marked like this:
```
<<<<<<< HEAD
(new code in upstream)
=======
(your code that you want to PR)
>>>>>>> Add Filmon PVR.
```