Fix problem where something in settings array is int 0
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	admin/jigoshop-admin-settings-api.php
Add redirect after error while adding to cart
Merge pull request #905 from megawebmaster/dev

Adding to cart after error