google analytics fixed
Merge branch 'staging'

Conflicts:
	index.html
Merge branch 'staging'
buttom style