Still working on email
Merge branch 'master' of github.com:inboundnow/cta

Conflicts:
	shared/classes/class.post-type.wp-lead.php