merge

cms/djangoapps/contentstore/tests/test_contentstore.py

cms/djangoapps/contentstore/tests/tests.py

common/lib/xmodule/xmodule/templates.py

common/lib/xmodule/xmodule/videoalpha_module.py

lms/envs/common.py

lms/envs/dev_edx4edx.py

lms/envs/edx4edx_aws.py

lms/lib/dogfood/README.md

lms/lib/dogfood/__init__.py

lms/lib/dogfood/check.py

lms/lib/dogfood/views.py

lms/templates/courseware/courseware.html

lms/templates/dogfood.html

lms/templates/gitupdate.html

lms/templates/quickedit.html

lms/urls.py