fix typo
Google Docs theme
Merge branch 'master' into dev

Conflicts:
	NEWS