Added check for invalid states error on Shipping Calculator.
Merge branch 'dev' of github.com:jigoshop/jigoshop into dev
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	classes/jigoshop_customer.class.php
Add new currency - Moroccan Dirhams
Fix for getting image from product
Merge pull request #878 from megawebmaster/dev

New currency Moroccan Dirhams