Merge branch 'release_1.0.2' into develop
added video
video + fixed conflicts