Updated to allow Forms

git-svn-id: https://plugins.svn.wordpress.org/net-results-marketing-automation/trunk@987297 b8457f37-d9ea-0310-8a92-e5e31aec5664
Fixed version conflict

git-svn-id: https://plugins.svn.wordpress.org/net-results-marketing-automation/trunk@987307 b8457f37-d9ea-0310-8a92-e5e31aec5664