Merge branch 'frodo'
Merge branch 'frodo'
Merge branch 'frodo'
Add supervisor , keep xbmc-server running if crashing
Merge branch 'Celedhrim-master' into gotham