Fix problem where something in settings array is int 0
filter for adding discount types
Merge pull request #891 from niravmehta/master

Filter for adding discount types
Revert "Merge pull request #891 from niravmehta/master"

This reverts commit 9eda8d2d26bb802792349c5fe6be263d62d599b0, reversing
changes made to 0fb78b4eae1e9e362afe71c5e289a8528680ca9d.
Merge branch 'refs/heads/dev'
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 #910 from robselway/dev

Corrected unset variable causing php warning in edit address pages
Merge pull request #905 from megawebmaster/dev

Adding to cart after error
Update Polish translation
Merge pull request #913 from megawebmaster/dev

Update Polish translation
Fix problem where something in settings array is int 0
Add redirect after error while adding to cart
Update Polish translation
Use calculated price without task when sending to PayPal
Merge pull request #914 from megawebmaster/dev

Use calculated price without task when sending to PayPal
Change occurences of jigoshop.com into www.jigoshop.com
Remove unnecessary duplicated PHP Post Max Size
Add functions for assets management

This functions are:
* jigoshop_add_style()
* jigoshop_add_script()

Additionally there are 2 more functions to use to distinguish current page:
* is_jigoshop_page()
* is_jigoshop_single_page()
Add checking for page on stylesheets