Fix problem where something in settings array is int 0
filter for adding discount types
Merge pull request #893 from sakhnik/dev

Update Ukrainian translation
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.
implement coupon filter for pull request #891
Changed the way of comparing valid PayPal currency, because of multi currency possibility
Merge pull request #901 from annzaan/dev

Changed the way of comparing valid PayPal currency, because of multi cur...
update for version 1.8.1
Merge branch 'dev' of github.com:jigoshop/jigoshop into dev

Conflicts:
	languages/jigoshop-uk.mo
	languages/jigoshop-uk.po
Merge branch 'refs/heads/dev'
Update jigoshop-admin-reports.php

If $total = 0 Display :
Warning: Division by zero in /home/annon597/public_html/www.themes-wordpress-francais.com/wp-content/plugins/jigoshop/admin/jigoshop-admin-reports.php on line 187
Merge pull request #903 from ThemesWpFr/patch-3

Update jigoshop-admin-reports.php
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	admin/jigoshop-admin-settings-api.php
Add redirect after error while adding to cart
Corrected unset variable causing php warning when a field with type = select is loaded on the edit address pages
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