Release for Jan 7, 2014

Conflicts:
	lms/djangoapps/courseware/management/commands/dump_course_structure.py