Typo [ci skip]
Work on asset type [ci skip]
Work on asset type [ci skip]
Rearrange some asset templates [ci skip]
Cleanup render_asset helper [ci skip]
Merge remote-tracking branch 'origin/asset_types' into verticals-cleanup

Conflicts:
	app/models/blog_entry.rb
	app/models/news_story.rb
	app/models/show_segment.rb
	app/views/outpost/events/_form_fields.html.erb
	app/views/outpost/shared/sections/_assets.html.erb
	app/views/shared/assets/default/_default.html.erb
	app/views/shared/assets/default/_sidebar.html.erb
	app/views/shared/assets/event/_float.html.erb
	spec/concerns/concern/associations/asset_association_spec.rb
Update migration files
Add ArticleFeature object + associations and methods [ci skip]