Merge branch 'master' into release
Updated makefile to point to development branch and ding2tal
Merge branch 'release' into development
Merge remote-tracking branch 'origin' into release
Updated makefile to point to ding2tal
Merge remote-tracking branch 'artesis/master' into development
Re-added makefile after merge
Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'ding2tal/release' into ding2-master