Updated makefile to point to ding2 master branches
Renamed function ding_content_remove_html5_video_display to ding_content_insert_html5_video_presets
Merge pull request #5 from ding2tal/core-pr-4

Core pr 4
Resolved merge conflict
Ensured that makefile points to ding2tal
Resovled merge conflict in makefile