Added New Zealand states.
Merge branch 'master' of github.com:woothemes/woocommerce
Issue #2865 Localize email settings

Change the behaviour of the get_option function so that it attempts to
localize the value for setting that is returned by the parent's
get_option by using gettext.
Fix IE Download via SSL bug and fix http file over SSL x-sendfile bug
Merge branch 'master' of github.com:woothemes/woocommerce into IE_download_fix

Conflicts:
	woocommerce-functions.php
Rework headers fix to only apply on SSL page and with IE8+
Check price is set when syncing prices for variations
Merge pull request #2871 from krbvroc1/IE_download_fix

Fix IE Download via SSL bug and fix http file over SSL x-sendfile bug
Merge pull request #2866 from reinoudvansanten/master

Patch for #2865
readme
Don't need to do this for all options. #2866.
Revert "Don't need to do this for all options. #2866."

This reverts commit 07917223fdf2e8175dad822ff8326c054655e426.
Typo
Action links Closes #2842.
Don't mess with plugins_url Closes #2859.
Nonce check notice. Closes #2869.
Switch download_url to non-SSL
Fix whitespace
Merge branch 'master' of github.com:woothemes/woocommerce
icon font for stars. #2672