shortcode insert fixes
finish tracking
Analytics updates
Merge remote-tracking branch 'Leads/master'