checkpoint
Merge branch 'master' into ga

Conflicts:
	public/index.html
checkpoint