Fix my git's f*ckup in upstream/master.

This reverts commit bfb0ba2b0417a043e39689592a807ede41f12034.
pvr: extracted the EPG code from the PVR code so it can be used separately later. this still uses some unchecked casts and will segfault when calling FixOverlappingEvents()
pvr: fix segfault from the last commit. add Persist() method for CEpg in CEpgDatabase
pvr: return value in FixOverlappingEvents()
pvr: fix SQL error because the wrong table was being truncated
pvr: remove useless error message from CEpgDatabase
epg: display the name of the table while updating
epg: only try to load the database once
epg: display the name of the table while loading the database
epg: use consistent naming for methods in CEpgDatabase
epg: cleanup some code
epg: fix segfault
Merge commit before reshuffle
Merge code-reshuffle
epg: always return the default value if a tag's title is empty
fix endless loop in PVRDatabase
fix segfault on persist of epg data
pvr: load the EPG from the database before creating new tables
pvr: fix updating the EPG tables
vdr-vnsi: cummulated changes

- massive code cleanup, removed all unneeded / unused files
- multiple client support