Remove unused .reviewboardrc
Remove unused nginx.conf
forums: fix assign_default_role to use the correct constant.
Release notes for 5/28/14
Move Jenkins scripts into `scripts` directory

with symlinks for backwards compatibility
Adds Mat Peterson to authors file
Change log now lists one section for June
Send the serialized string to the track_function in split_test_module.
BLD-933: Add table of contents.
ORA2 release-2014-06-11T10.43
Install edx-submissions from PyPi instead of from edx-ora2
Merge pull request #4039 from edx/anton/context-aware-video-index

Video Editor: Add table of contents.
Review all fs.files and modulestore indices
and fix some gridfs calls to reduce traffic
BLD-726: ChoiceTextGroup i18n.
Merge pull request #3881 from edx/markhoeber/documentation/doc-452

Release notes for 5/28/14
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
Merge pull request #4052 from edx/will/ora2-release-2014-06-11T10.43

ORA2 release-2014-06-11T10.43
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