disabled analytics code in master
Merge branch 'master' into gh-pages
re-enable analytics in gh-pages