Grammar fix

Conflicts:
	quick_tour/the_model.rst
Merge branch '1.0'

Conflicts:
	_exts
	quick_tour/the_model.rst