added has_permission to api.user
correct typo in doc string
Added 'has_permission' details to narrative documentation
Simplify testing of has_permission section of the docs
Correct use of "permissions" to singular, for has_permission
Merge branch 'master' into has-permission
Merge branch 'has-permission'

Conflicts:
	docs/CHANGES.rst