Remove ADMIN_MEDIA_PREFIX since it has been deprecated in Django 1.4
Merge branch 'update_django'