Merge remote-tracking branch 'origin/feature/nate/simple-chat' into edx-west/release-candidate-20130613

Conflicts:
	lms/templates/courseware/accordion.html
	lms/templates/courseware/course_navigation.html
	lms/templates/courseware/progress.html
	lms/templates/navigation.html