to cms settings (it was throwing 500s for Stanford when the CMS
calls render_from_lms)

Conflicts:
	cms/djangoapps/contentstore/utils.py
	cms/templates/login.html
	cms/templates/widgets/header.html
	cms/templates/widgets/sock.html
	lms/envs/test.py

add a default XML serialization if the 'data' field is empty or None. Some XModules now - like video XModule - do not have XML set in the 'data' field

Fix section release acceptance test failure.

Studio internationalization

because we've moved our password_reset_confirm.html into the theme repo.
This reduces edx-west diff with master.

should be a no-op for edx-east, but allow edx-west to remove
vendor.js with a blank {% block %}
in our password_reset_confirm.html to fix a bug

[STUD-431] Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRAT...

Add management command to Studio for exporting all courses; useful for periodic backups of course content in Studio

Merge remote-tracking branch 'origin/giulio/peer-grading-style-release' into edx-west/release-candidate-20130711

Giulio/peer grading style release

[STUD-406] Fix/cdodge/unescape quote strings

change serialize_field to check for type. If value is a string, simply return that, otherwise do a json.dumps

vagrant: Always mount `node_modules` folder after Vagrant NFS mount

Added documentation to new acceptance test features and techniques