Simplify image content and migrations
Merge branch 'cms' of github.com:mmoravcik/folioport into cms

Conflicts:
	folioport/apps/dashboard/cms/views.py
	folioport/templates/folioport/dashboard/cms/item_create.html