email notifications wysiwyg fix
Merge branch 'master' of github.com:inboundnow/leads

Conflicts:
	shared/shortcodes/js/shortcodes.js