bugfixes in m2m support
mini-change
Made Proxy immutable with disabled field.

Also improved admin and made necessary changes in rest of code to use the new model type.