added analytics handlebars
fixed merge confict
Merge branch 'master' of https://github.com/katiecanada/OH