Fix bug with GIF thumbnail and context aware item rendering
Merge branch 'cms' into new_edit_screen

Conflicts:
	folioport/templates/folioport/dashboard/cms/includes/container_content.html
Render items through tag