Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Updated makefile to point to tag 7.x-1.0-beta2
Resolved merge conflict in make file
Merge branch 'release' into development
Changed ding_page to use development branch in make file