Merge branch 'development' into release
Updated makefile to point to tag 7.x-1.0-beta4
Merge branch 'development' into release
Updated makefile to point to tag 7.x-1.0-beta5
Merge branch 'development' into release
Updated makefile to point to tag 7.x-1.0-rc1
Updated makefile to point to tag 7.x-1.0-rc2
Updated makefile to point to tag 7.x-1.0-rc3
Merge branch 'release'
Updated makefile to point to ding2 master branches
Resolved merge conflict
Merge branch 'master' into development
Updated make file to point to development branch