Merge branch 'master' into move_settings

djangoapps/courseware/grades.py

djangoapps/courseware/modules/capa_module.py

djangoapps/simplewiki/mdx_circuit.py

djangoapps/simplewiki/media/css/autosuggest_inquisitor.css

djangoapps/simplewiki/media/css/base.css

djangoapps/simplewiki/media/css/base_print.css

...implewiki/media/css/img_inquisitor/_source/as_pointer.png

...simplewiki/media/css/img_inquisitor/_source/li_corner.png

...simplewiki/media/css/img_inquisitor/_source/ul_corner.png

...goapps/simplewiki/media/css/img_inquisitor/as_pointer.gif

...apps/simplewiki/media/css/img_inquisitor/hl_corner_bl.gif

...apps/simplewiki/media/css/img_inquisitor/hl_corner_br.gif

...apps/simplewiki/media/css/img_inquisitor/hl_corner_tl.gif

...apps/simplewiki/media/css/img_inquisitor/hl_corner_tr.gif

...apps/simplewiki/media/css/img_inquisitor/ul_corner_bl.gif

...apps/simplewiki/media/css/img_inquisitor/ul_corner_br.gif

...apps/simplewiki/media/css/img_inquisitor/ul_corner_tl.gif

...apps/simplewiki/media/css/img_inquisitor/ul_corner_tr.gif

djangoapps/simplewiki/media/img/box_corner_bl.gif

djangoapps/simplewiki/media/img/box_corner_br.gif