Fixed the preferences scope of xblock.

Added self to authors.

Conflicts:
	AUTHORS
	CHANGELOG.rst