Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Cache settings modified
Updating feed importer so a feed can have a default set of media
Merge branch 'development'
Changed input filter for editors
something was modified by magic
Merge branch 'development'
Updated so feed importer title is inserted as lead
Added a new layout for rss text feeds
Updated styling for Text feed
Changed slide theming so colors are controled by class names added to the slide container
Changed default value for layout on mrss feed importer content type
Updated logo size on slides
Adjusting logo size in break points
Updated layout thumbs
Added a new layout choice
Now using the correct layout thumbs