Only add mentoring application to INSTALLED_APPS when in virtualenv
Update import location of `prefer_xmodules`
Normalize the representation of Scope.content data in MongoModulestore FieldData

Without this, the new 'items' field in the course_info xmodule caused
bizarre behavior. If you added the text 'items' to a course_info
section, then the LMS would throw a 500, because the field name isn't
'data', but the stored data is a string, leading to the check of
`key.field_name in self._data`, where key.field_name is the string 'items',
and self._data is the content string.
Delay import of xmodule packages until after sys.path fixup
Merge pull request #2880 from edx/cale/fix-crazy-items-error

Cale/fix crazy items error
Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10

Conflicts:
	cms/envs/common.py
	lms/envs/common.py
Merge pull request #2885 from cpennington/merge-release-2014-03-10

Merge release from 2014-03-10