Speed up lti acceptance test for remote webdriver.
Speed up problems feature tests
Merge pull request #1108 from edx/christina/remove-user-id-help

Christina/remove user id help
add unread comments count to sr block so user can hear unread comment count
Merge pull request #1110 from edx/feature/kevin/forum_activity_accessibility
Speed up waiting for elements not present on remote webdriver sessions.
Update event doc from wiki

    update to grid table
    Cleaned up formatting to use `` instead of :code:
    Added Instructor Events and cleaned up outline
    Added instructor events. Cleaned up outline.
    Moved out correct_map table to addendum
    Removed deprecated/undocumented events
Added tags to acceptance tests to define multiple shards.
Put assets JavaScript code back in something that goes through pipelining.
Merge pull request #1113 from edx/christina/fix-asset-index

Put the non-Backboned assets JavaScript back into its own file.
Write xunit reports for acceptance tests
Refactor rake tasks for acceptance tests
Address PR comments
Merge pull request #1075 from edx/zoldak/xunit-acceptance-reports

Zoldak/xunit acceptance reports
Merge pull request #809 from edx/event_spec_update

Update event doc from wiki
Merge pull request #1083 from edx/zoldak/speedy-lms-acceptance

Speed up lms acceptance tests
Namespace the acceptance tests so they show up nicely in jenkins

Conflicts:
	cms/djangoapps/contentstore/features/advanced-settings.feature
	cms/djangoapps/contentstore/features/checklists.feature
	cms/djangoapps/contentstore/features/component.feature
	cms/djangoapps/contentstore/features/course-overview.feature
	cms/djangoapps/contentstore/features/course-settings.feature
	cms/djangoapps/contentstore/features/course-team.feature
	cms/djangoapps/contentstore/features/course-updates.feature
	cms/djangoapps/contentstore/features/courses.feature
	cms/djangoapps/contentstore/features/discussion-editor.feature
	cms/djangoapps/contentstore/features/grading.feature
	cms/djangoapps/contentstore/features/html-editor.feature
	cms/djangoapps/contentstore/features/problem-editor.feature
	cms/djangoapps/contentstore/features/section.feature
	cms/djangoapps/contentstore/features/signup.feature
	cms/djangoapps/contentstore/features/static-pages.feature
	cms/djangoapps/contentstore/features/subsection.feature
	cms/djangoapps/contentstore/features/textbooks.feature
	cms/djangoapps/contentstore/features/upload.feature
	cms/djangoapps/contentstore/features/video-editor.feature
	cms/djangoapps/contentstore/features/video.feature
	lms/djangoapps/courseware/features/certificates.feature
	lms/djangoapps/courseware/features/help.feature
	lms/djangoapps/courseware/features/high-level-tabs.feature
	lms/djangoapps/courseware/features/homepage.feature
	lms/djangoapps/courseware/features/login.feature
	lms/djangoapps/courseware/features/lti.feature
	lms/djangoapps/courseware/features/navigation.feature
	lms/djangoapps/courseware/features/problems.feature
	lms/djangoapps/courseware/features/registration.feature
	lms/djangoapps/courseware/features/signup.feature
	lms/djangoapps/courseware/features/video.feature
	lms/djangoapps/courseware/features/word_cloud.feature
Review fixes
Merge pull request #1090 from edx/jkarni/feature/middleware-locked-assets

Jkarni/feature/middleware locked assets
Merge branch 'release'
Add "Download CSV of all student anonymized IDs" button to instructor dashboard

This is a recurrent ops problem, so we wanted to make it available
on the instructor dashboard.
Import/export static content properties
Even though xml based courses will ignore.