added ga
modified index
resolved CNAME conflict
added js
Merge branch 'develop'