Master

Updated the admin.py to work with django 1.6