Merge branch 'giulio/peer-grading-style-release' of github.com:edx/edx-platform…

Merge branch 'giulio/peer-grading-style-release' of github.com:edx/edx-platform into edx-west/release-candidate-20130806

Conflicts:
	common/lib/capa/capa/templates/choicegroup.html

common/lib/xmodule/xmodule/capa_module.py

@@ -1064,7 +1064,7 @@ class CapaModule(CapaFields, XModule):
         self.system.track_function('save_problem_success', event_info)
         msg = "Your answers have been saved"
         if not self.max_attempts == 0:
-            msg += " but not graded. Hit 'Submit' to grade them."
+            msg += " but not submitted. Hit 'Submit' when you are ready."
         return {'success': True,
                 'msg': msg}