Increase the test SQLite DB timeout. TE-397

Split mongo assets cherry

Removing unused import

Reduce tech debt in forum sidebar

Add myself to AUTHORS.

Fix the link to the Ubuntu installation instructions

Always call `git fetch edx` before finding PR branches

Fix user handling bug in split test module

STUD-1948

ORA2 release-2014-07-07T19.28

Merge rc to master

LMS-2876

This reverts commit a16f5487.

Deleting a child of a unit should convert the unit to draft

Now that the sidebar class is no longer used, many rules no longer need
!important and can move out of _shame.scss.

This will enable much cleanup of the relevant SASS rules.

Sarina/070714 language update

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py

BLD-1117, BLD-1217: Add read-only list of Group Configurations, Create feature flag.

if the unit is draftable but isn't yet draft.

Add openedx-analytics discussion group to CONTRIBUTING file

Fixes has_changes to search all the way to leaf nodes

The filter box will now remain fixed while the rest of the menu scrolls.
This also fixes a minor cosmetic bug in which the thread list would
overflow its container if the user opened the browse menu, scrolled the
page, and then closed the browse menu.

skipping update assets, not just collectstatic, in unit tests

Use deprecated course_key when calling the analytics API.

Previously it was serializing the course_key directly, which is not
interpreted correctly by the API.