Fix/featuremerges

Back to the good old formset for now.  

Luckily InlineFormsetFactory does support Polymorphic models in general, but some more gymnastics will be need to edit multiple Image types in the same formset.