lin act
Merge branch 'master' of github.com:AktionLab/xhab-control-panel
update ip for video feed
merge
Merge branch 'master' of github.com:AktionLab/xhab-control-panel
Merge branch 'master' of github.com:AktionLab/xhab-control-panel
updates from work at SLSL