Update
Merge branch 'master' of https://github.com/jimhigson/googos

Conflicts:
	statics/js/scripts.js