mist
Merge branch 'SettingsDev' of https://github.com/squob/VideoService into SettingsDev