Update for my addthis-social-plugin.php
Merge remote-tracking branch 'origin/Yuchen-Branch' into Yuchen-Branch

Conflicts:
	wp-content/plugins/addthis_plugin_test/addthis-social-signup-plugin.php