[njoy] fix loading android library
Merge pull request #144 from nberlee/master

Fix Njoy library loading
[tvheadend] int -> uint32_t
[tvheadend] process new optional webroot param in htsp hello.
[tvheadend] add support for new imagecache feature.
[tvheadend] create routine for generating web urls and use this in HTSPData.
[tvheadend] bump to 1.6.16
Merge branch 'pvr.hts'. closes #146
[tvheadend] fix win32 build
Merge branch 'master' into development
MediaPortal: channel icons: search also for these extesions: .jpg .jpeg .bmp .gif
(Still Windows only)
MediaPortal: search also for the genre_translation.xml file in the profile folder
(userdata/addon_data/pvr.team-mediaportal.tvserver)
This allows for storing a modified file at a writable location
MediaPortal: refactor: move loading card settings to separate function