Get to ze cropper!
Merge branch 'master' of github.com:onefinestay/django-mediacat

Conflicts:
	mediacat/static/mediacat/library.js
	mediacat/static/mediacat/library.js.map
	static/js/components/category-tree.jsx