update version
added google analytics
merge