update 2.1.6
Merge branch 'master' of https://github.com/sw33tr/mywoocommerce_upstream into testing

Conflicts:
	i18n/languages/woocommerce-ro_RO.mo
	i18n/languages/woocommerce-ro_RO.po