updated videos and mp4 detection in js
stuff
fixed merge