Merge branch 'development' of https://github.com/mhild/Sick-Beard
Change-Id: I186994cc7c6d66e938bd17ad99b9edcb30dd0aab