Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches

cms/djangoapps/contentstore/views.py

common/djangoapps/student/views.py

common/djangoapps/xmodule_modifiers.py

common/lib/capa/capa/capa_problem.py

common/lib/xmodule/xmodule/x_module.py

common/lib/xmodule/xmodule/xml_module.py

lms/djangoapps/courseware/module_render.py

lms/envs/common.py

lms/envs/dev.py

lms/envs/dev_ike.py

lms/static/admin/css/base.css

lms/static/admin/css/changelists.css

lms/static/admin/css/forms.css

lms/static/admin/css/ie.css

lms/static/admin/css/login.css

lms/static/admin/css/rtl.css

lms/static/admin/css/widgets.css

lms/static/admin/img/changelist-bg.gif

lms/static/admin/img/changelist-bg_rtl.gif

lms/static/admin/img/chooser-bg.gif