Added fixes for analytics
Merge branch 'master' of heroku.com:accenture-hpit