Merged with master.

.gitignore

cms/djangoapps/contentstore/tests/test_contentstore.py

cms/djangoapps/contentstore/views.py

cms/templates/base.html

cms/templates/settings.html

common/lib/capa/capa/calc.py

common/lib/capa/capa/tests/test_responsetypes.py

common/lib/xmodule/xmodule/modulestore/draft.py

common/lib/xmodule/xmodule/modulestore/mongo.py

common/lib/xmodule/xmodule/modulestore/store_utilities.py

common/lib/xmodule/xmodule/templates/about/overview.yaml

.../lib/xmodule/xmodule/templates/problem/latex_problem.yaml

common/static/images/firecode.jpg

common/static/images/high_pass_filter.png

common/static/images/mit_dome.jpg

common/static/images/pl-course.png

common/static/images/pl-faculty.png

common/static/images/simple_graph.png

common/static/images/voltage_divider.png

conf/locale/config