updates to remove short code nag
Merge branch 'master' of https://github.com/inboundnow/leads

Conflicts:
	shared/shortcodes/inbound-shortcodes.php