Merge branch 'refs/heads/2.3'

Resolved Conflicts:
	lib/salesforce_admin.class.php

Signed-off-by: Nick Ciske <nick@thoughtrefinery.com>

git-svn-id: https://plugins.svn.wordpress.org/salesforce-wordpress-to-lead/trunk@876043 b8457f37-d9ea-0310-8a92-e5e31aec5664