bad conflicts :(
slide x on brightcove video
mobile tweaks
update readme
fix merge