ensuring width is an int
Fix some issues with south
Merge branch 'master' of github.com:onefinestay/django-mediacat

Conflicts:
	mediacat/__init__.py
Merge commit 'a97201c62e89a621bdc7f83b004d9cb88ad1a4eb' into OFS_5925_promo_tag_cms_fix

Conflicts:
	mediacat/__init__.py