gema fix + mods
Merge remote-tracking branch 'origin/Billy2011'
Merge branch 'master' of https://github.com/Bobynator/Mediaportal