Fixed the preferences scope of xblock.

Added self to authors.

Conflicts:
	AUTHORS
	CHANGELOG.rst
Merge pull request #222 from edx/felix/prefsscopefix3

Fixed the preferences scope of xblock.