ding2 -> ding2tal
tag -> branch
Resolved merge conflict with PH libraries
Changed blackhold to virtual field
Added virtual field to make file
Added update function from blackhole to virtual field
Changed makefile to point to ding2 on github
Rename hook_anchor_info() to hook_ding_anchor_info()
Merge branch 'master' into develop
Merge pull request #1 from ding2tal/core-pr-3

Core pr 3 (merge with Artesis)
Merge remote-tracking branch 'ding2/master' into ding2-master
Merge branch 'ding2-master' into case-2764

* ding2-master:
  Rename hook_anchor_info() to hook_ding_anchor_info()
  Changed makefile to point to ding2 on github
  Added update function from blackhole to virtual field
  Added virtual field to make file
  Changed blackhold to virtual field
  tag -> branch
  ding2 -> ding2tal
Case 2764 - Merged upstream and fixed local issues.
Merge branch 'case-2764' into develop

* case-2764:
  Case 2764 - Merged upstream and fixed local issues.
  Rename hook_anchor_info() to hook_ding_anchor_info()
  Changed makefile to point to ding2 on github
  Added update function from blackhole to virtual field
  Added virtual field to make file
  Changed blackhold to virtual field
  tag -> branch
  ding2 -> ding2tal
Merge branch 'develop'
Release: v1.14