Merge branch '2.1'

Conflicts:
i18n/languages/woocommerce-admin.pot
i18n/languages/woocommerce.pot
package.json
readme.txt
woocommerce.php