Merge branch 'master' into ux/marco/studio-componentsettings

.ruby-gemset

cms/envs/common.py

cms/envs/jasmine.py

cms/envs/test.py

cms/static/coffee/files.json

cms/templates/base.html

common/djangoapps/student/views.py

common/static/coffee/spec/.gitignore

create-dev-env.sh

github-requirements.txt

jenkins/base.sh

jenkins/test.sh

lms/envs/common.py

lms/envs/jasmine.py

lms/static/coffee/files.json

lms/static/images/press/cbsnews_178x138.jpg

lms/static/images/press/nytimes_240x180.png

lms/static/images/press/wash_post_logo_178x138.jpg

lms/templates/feed.rss

lms/templates/index.html