fixed merge conflicts in app/admin/user.rb
fixed merge conflicts in app/admin/user.rb

DigitalCurationCentre/roadmap,DMPRoadmap/roadmap,CDLUC3/roadmap,CDLUC3/roadmap,CDLUC3/dmptool,CDLUC3/roadmap,DMPRoadmap/roadmap,CDLUC3/dmptool,DigitalCurationCentre/roadmap,CDLUC3/dmptool,briri/roadmap,CDLUC3/roadmap,CDLUC3/dmptool,briri/roadmap,briri/roadmap,DMPRoadmap/roadmap,DigitalCurationCentre/roadmap