Rearranged ModelAdmins to enforce proper inheritance and added activate/deactivate actions

Combining merge request #8 from Hamms