coffee note adding
Merge branch 'dev'
analytics change