Updated make file to point to ding2tal
Changed makefile to use development branch
Resolved merge conflict with release branch
Merge remote-tracking branch 'origin' into release