Merge branch 'admin_adapt' into 'testing'

hack to get admin recognized again

See merge request !9
1 job for testing in 2 seconds (queued for 3 seconds)