bugfixbugfix for django 1.5 compatibility for admin static in templates
Merge branch 'refs/heads/master' into related-objects