Conflicts:
	CHANGELOG.rst

Rc/2013 09 18

Valera/bugfix access to hidden controls

Fix import errors with unicode filenames

Turned off jQuery animations. Went through all of the XModule tests and
checked that all spying on window.setTimeout() function is done properly.

Hotfix/lti typo

Replace references to .system

Add rb-inotify dependency

Indicate that rb-inotify and rb-fsevent aren't actually necessary

Problem with hideControls not being called via setTimeout().

Now when controls are uatohidden and focus is on one of them, we
switch the focus to the mian Video element.

Code documented a bit.

When controls are autohidden, we make sure that speeds and volume
controls drop downs are closed.

This reverts commit acd23ad9.

A few OE UI fixes

- require confirmation when clicking Open Ended reset button (now working)
- require confirmation when submitting Open Ended essay (now working)
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos

LMS/Accounts: Switch class-based Sass @extend rules to use Sass placeholder syntax

LMS/Accounts: Converts many class-based Sass archetype-focused @extends to use Sass placeholder syntax

LMS: FIX - Removes unused/placeholder copy

LMS: removes placeholder copy (lorem ipsum) that was never used or never replaced if cases are in use

Minor cleanup.

a few missed placeholder conversions in verification sass

Improve retry logic for Stale Element Exceptions

LMS: resolves direct class name references to extends that have been con...

Update changelong for due_date_display_format.

Better exception retry logic

Change methods to lambdas

Zoldak/acceptance exception handling

Better exception retry logic

Change methods to lambdas