added google analytics
merged from remote