clean up migrations
more cleanup
Merge branch 'master' of github.com:onefinestay/django-mediacat

Conflicts:
	mediacat/models.py
Start making crop lists a bit prettier