fixes
Merge branch 'master' of github.com:atk4/atk4-addons

Conflicts:
	filestore/lib/Model/Image.php