Updating the admin template to support the latest django admin code
Fixing a merge conflict