google js removed
Merge branch 'master' into develop