add new taxonomy fix image in social add wysiwyg to custom taxonomy via light plugin from github - missing qtranslate support
add new taxonomy fix image in social add wysiwyg to custom taxonomy via light plugin from github - missing qtranslate support
Merge origin/master

Conflicts:
	wp-content/plugins/woocommerce-expedited-order-email-master/includes/class-wc-expedited-order-email.php