adding zinnia and cmsplugin-zinnia
conflict resolved