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