Merge pull request #3 from JeppeTh/master

Fixed searching and bundled categories
Merge pull request #11 from meriko/master

Fixed searching and bundled categories
Restoration after rebase
* Keep TV4Channels in case
* Keep sorting
Adding personal "availabilty" etc
Fixed searching and bundled categories
* Fixed searching which still didn't work
* Put all categories into a "Kategorier" directory to minimize number of choices
in start screen
* Minor fix for Live shows.
Missed some lines in GetAvailability