Conflicts:
	lms/djangoapps/courseware/tests/test_navigation.py
	lms/djangoapps/courseware/tests/test_view_authentication.py
	lms/djangoapps/courseware/tests/tests.py

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	lms/djangoapps/courseware/tests/tests.py

Added info to changelog for recent pull requests.

Addtional comments for YouTube API bug.

fixing segment io settings bug

* Moving to the auth tokens section
* Removing the feature flag logic since all features are loaded earlier
```
    for feature, value in ENV_TOKENS.get('MITX_FEATURES', {}).items():
        MITX_FEATURES[feature] = value
```

Update to look for segment io key in auth data.

Simplify calc.py; add trig/other functions

Default to unicode for sass compilation.

Replace /faq route in LMS urls

remove compiled coffeescript files before recompiling with rake

Add additional events for tracking

force-refresh youtube iframe when changing speeds back to 1.0 in firefox

Valera/no autoplay videoalpha studio

Moved the definition of autoplay attribute to videoalpha_module.py file. Changed double negative if statement for autoplay check to simple if.

Copied autoplay attribute from video xmoudle to videoalpha. Now students will have the video autoplaying, and in Studio it will be pause by default.

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.

This prevents inapplicable tests from running when switching branches

Move "stringy" functionality into xblock fields

Added rake jasmine:cms:browser:watch command

Especially the var[0].isdigit() one.

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.