Merge branch 'production'
update intercom with user name and api key
Merge branch 'master' into production