Merge branch 'My-Devel' into ThePirateBay
Merge branch 'ThePirateBay' of https://github.com/AlexBoogaard/Sick-Beard into ThePirateBay