Merge branch 'master' into diana/rubric-ui-improvements

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py

lms/static/admin/js/compress.py

@@ -6,6 +6,7 @@ import sys
 
 here = os.path.dirname(__file__)
 
+
 def main():
     usage = "usage: %prog [file1..fileN]"
     description = """With no file paths given this script will automatically