Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
fixed consent test.
Merge pull request #193 from SartoriusEarth/develop

Fixed consent controller test from failing. Also changed test user admin helper to compile.