video player issue in activity
version update
Merge branch 'master' into develop