update google analytics shim
Merge branch 'master' into develop
keep debug true for develop branch
update site whitelist
keep debug false for master branch
bugfix url resolution
Merge branch 'develop'
add google analytics
Merge branch 'develop'