If Video Alpha is playing a YouTube video in Firefox in HTML5 mode, then when switching to speed 1.0 it will simply reload the iframe, instead of using the built-in method to change the speed. The fixes the bug temporarily, while the YouTube team fixes the bug internally in the API. Commented additions to fix YouTube firefox speed 1.0 switch bug.

Move "stringy" functionality into xblock fields

Added rake jasmine:cms:browser:watch command

Remove the stores_state field from XModule

stores_state is now only used in a single test, in conjunction with
has_score. In practice, it's never the case that stores_state is false
when has_score is true, so we can delete stores_state entirely, and just
use has_score for the grading test.

Starting the CHANGELOG process.

Squash 3 more naive datetime warnings. I think the only ones left are in

dummy object creation without conditionals

added comment to make clear that leaving the variable analytics outside of the feature flag block is intentional

migrations.

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_fields.py
	requirements/edx/github.txt

Fix formatting problem in README.md 

message to explain why this merge is necessary,

Make video captions respect course author's setting.

Do a bundle install before trying to use rake, so that we have all the p...

Fix tests that vary urls.py

(cherry picked from commit 14100ba1)

(cherry picked from commit 832da3ad)

(cherry picked from commit 050846af)

(cherry picked from commit 664efb98)

(cherry picked from commit a17bf5e2)

(cherry picked from commit 273df4e1)

(cherry picked from commit c96511a2)

(cherry picked from commit 1511ec84)

(cherry picked from commit d2554909)

Problem Show Answer/Check Button Line Height Syncing