Merge remote-tracking branch 'origin/feature/kluo/bulk-email-squashed' into edx-west/release-candidate-20130729

Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	lms/djangoapps/courseware/views.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/courseware/courseware.html