forums: fix assign_default_role to use the correct constant.
Send the serialized string to the track_function in split_test_module.
Annotation Tools: PR #3907

Annotation Tools: Load Tinymce in student_view

Annotation Tools: Fixing tests for student_view

Fixed typo from autocomplete

Fixed dict for tests
Annotation Tool: PR #3969

Text Annotation Tool: Added Instructor Filter and Clear Search

Video Annotation Tool: Added Instructor Filter

Image Annotation Tool: Added Instructor Filter

Image Annotation Tool: Annotation Mode for AB Testing

Annotation Tools PR Fixes

- forgot to overwrite the previous line

Annotation Tools: PR Fixes

- Fixed camel case for variable name
- Fixed indentation in imageannotation.html
- Changed all mentions of Instructor Username to Email
- Turned annotation_mode into phrase
- Fixed indentation in imageannotation.html
- Added comments in imageannotation.html

- Changing annotation_mode in OSDA

Annotator Tools: OpaqueKeys update for Notes

Annotation Tools: Added CommonAnnotatorMixin

Annotator Tool: Fixed delete bug and factored out settings

Removed print context

Conflicts:
	common/lib/xmodule/xmodule/imageannotation_module.py
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py
	lms/djangoapps/notes/views.py
Annotation Tool: PR #4019

Reverting commit @3bfb633 and updating openseadragon.js for latest build

Conflicts:
	common/lib/xmodule/xmodule/imageannotation_module.py
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py
Annotations Tools: i18n Make stati strings extractable

Original changes found in this commit
https://github.com/edx/edx-platform/commit/a6bae4d238fdc6a60c8ee9f1b80ca
3512bb085eb

Conflicts:
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py
3 entries for June -> 1 entry
Merge pull request #4053 from edx/harvard-annotations-on-hotfix

Harvard annotations on hotfix
Allow users that have unregistered from a verified course to re-register.

Fixes LMS-2830
Merge pull request #4058 from cpennington/hotfix/lms-2830

Allow users that have unregistered from a verified course to re-register.
Do not merge zh-hk into zh-tw in darklang
Merge pull request #4057 from louyihua/dark_lang

Do not merge zh-hk into zh-tw in darklang
Merge pull request #4046 from edx/hotfix/2014-06-11

Hotfix 2014-06-11
Fix wiki search query
and formatting error in a doc file.
Merge pull request #4064 from edx/ahodges/documentation/20140611chglog

3 entries for June -> 1 entry
Update SASS pipeline to generate source maps

Note: this requires SASS 3.3+ so do ```bundle install```
Set sass spec version requirement to 3.3.5.
updating Neat gem file to version 1.6.0
updating Bourbon gem file to version 4.0.1
setting Bourbon spec version requirement to 4.0.1 and Neat spec version requirements to 1.6.0