log stop_video event
Added mising tinymce.js to static_htmlbook.html.

LMS-2848
Pass storage_url and token values as parameters to StudentNotes init.

LMS-2848
Merge pull request #4190 from edx/usman/lms2848-htmlbooks-fix

Fix for htmlbooks
Redirect Chinese students to a Chinese CDN for video.
Remove pirate and lolcat translation files to prevent accidental display
Merge pull request #4197 from edx/sarina/remove-en@-translations

Remove pirate and lolcat translation files to prevent accidental display
Merge pull request #4196 from edx/oleg/video-caching

Redirect Chinese students to a Chinese CDN for video.
Move video descriptor instantiation in tests to single place.
Merge pull request #4086 from edx/alex/refactor_video_test_2

Move video descriptor instantiation in tests to single place.
Deprecating acceptance_tests from rake to paver
Merge pull request #2571 from Szczork/szczork/log-video-ended

log stop_video event
Update EASE to include an optimization
Update testing.md
Merge pull request #4167 from edx/clytwynec/rake2paver-acceptance

Clytwynec/rake2paver acceptance
Merge branch 'release'

Conflicts:
	common/lib/xmodule/xmodule/tests/test_video.py
edited and reviewed release notes
Merge pull request #4194 from edx/ahodges/documentation/relnotes20140624

edited and reviewed release notes
Merge pull request #4187 from edx/will/update-ease-for-optimization

Update EASE to include an optimization