Merge branch 'Organisation-switching-bug'
Merge branch 'master' of https://github.com/DigitalCurationCentre/DMPonline_v4