require jquery
Merge branch 'master' of github.com:inboundnow/cta

Conflicts:
	shared/inbound-shortcodes/inbound-shortcodes.php