040114 new feature email
Merge branch 'master' into alan
small copy adjustments on /pricing
update to /pricing
Merge remote-tracking branch 'origin/alan'