add beacon button
merge master
update ui video page
merge master
add condition in prepareForSegue in ViewControllerDetails