Merge hotfix 2013-07093 into master

Conflicts:
	common/lib/xmodule/xmodule/crowdsource_hinter.py
	common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss
	common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee
	common/static/coffee/src/logger.coffee
	common/templates/hinter_display.html
	lms/envs/test.py
	lms/urls.py

common/lib/xmodule/xmodule/crowdsource_hinter.py

@@ -227,7 +227,7 @@ class CrowdsourceHinterModule(CrowdsourceHinterFields, XModule):
         Returns key 'hint_and_votes', a list of (hint_text, #votes) pairs.
         """
         if self.user_voted:
-            return json.dumps({'contents': 'Sorry, but you have already voted!'})
+            return {}
         ans_no = int(get['answer'])
         hint_no = str(get['hint'])
         answer = self.previous_answers[ans_no][0]

common/lib/xmodule/xmodule/css/crowdsource_hinter/display.scss

@@ -16,12 +16,12 @@
 
 #answer-tabs .ui-widget-header {
   border-bottom: 1px solid #DCDCDC;
-  background: #F3F3F3;
+  background: #FDF8EB;
 }
 
 #answer-tabs .ui-tabs-nav .ui-state-default {
   border: 1px solid #DCDCDC;
-  background: #F8F8F8;
+  background: #E6E6E3;
   margin-bottom: 0px;
 }
 

common/lib/xmodule/xmodule/js/src/crowdsource_hinter/display.coffee

@@ -72,3 +72,5 @@ class @Hinter
       JavascriptLoader.executeModuleScripts @el, () =>
         @bind()
       @$('#previous-answer-0').css('display', 'inline')
+    else
+      @el.hide()

lms/urls.py

@@ -214,8 +214,6 @@ if settings.COURSEWARE_ENABLED:
         url(r'^mktg/(?P<course_id>.*)$',
             'courseware.views.mktg_course_about', name="mktg_about_course"),
 
-
-
         #Inside the course
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/$',
             'courseware.views.course_info', name="course_root"),
@@ -223,6 +221,7 @@ if settings.COURSEWARE_ENABLED:
             'courseware.views.course_info', name="info"),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/syllabus$',
             'courseware.views.syllabus', name="syllabus"),   # TODO arjun remove when custom tabs in place, see courseware/courses.py
+
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/book/(?P<book_index>\d+)/$',
             'staticbook.views.index', name="book"),
         url(r'^courses/(?P<course_id>[^/]+/[^/]+/[^/]+)/book/(?P<book_index>\d+)/(?P<page>\d+)$',