testdriven added a admin link for admins only
added comment
merge conf