Added new ModelAdminMixin
Merge branch 'master' into sphinx