set up  offserver video in activity section
Merge branch 'development'
resolve conflict"