Merge pull request #225 from Taverius/master

DRE Support update
CRP
Add Toolbar icons to ATM override.