Merge branch 'development' into release
Updated makefile to point to tag 7.x-1.0-beta3
Resovled merge conflict in make file
Updated makefile to point to tag 7.x-1.0-beta4
Merge remote-tracking branch 'origin' into release
Updated makefile to point to tag 7.x-1.0-beta5
Merge remote-tracking branch 'origin' into release
Updated makefile to point to tag 7.x-1.0-rc1
Updated makefile to point to tag 7.x-1.0-rc2
Merge branch 'development' into release
Merge remote-tracking branch 'origin' into release
Updated makefile to point to tag 7.x-1.0-rc3
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