Merge remote-tracking branch 'upstream/master'

Conflicts:
	run_time/src/gae_server/chrome/js/script.js
	run_time/src/gae_server/help.py
Merge branch 'master' of github.com:ahmet-celik/incremental-fonts

Conflicts:
	run_time/src/gae_server/chrome/js/script.js