better save button
Merge branch 'master' of github.com:habari-extras/addon_catalog

Conflicts:
	templates/block.addoncart.php