Merge branch 'master' into gh-pages
mailchimp code and GPS
Merge branch 'gh-pages'