Merge branch 'core-pr-3' into development
Updated make file to point to ding2tal
Changed makefile to use development branch
Added <br> tag to allowed tags
Resolved merge conflict with release branch
Merge remote-tracking branch 'origin' into release