Add google analytics
Merge branches