Repair GA
Merge branch 'master' into gh-pages

* master:
  Repair GA

Conflicts:
	_includes/google-analytics.html