Fix #413 MediaBrowser is now a Device (and now more a Service)
Merge branch 'master' of https://github.com/appsgate2015/appsgate