Merge branch 'admin_adapt' into 'testing'

hack to get admin recognized again

See merge request !10
1 job for testing in 1 second (queued for 3 seconds)