Merge branch 'master' into development
validation added  on offserver add and edit video
Merge branch 'development'