added easyhtml5video
merged conflicts