Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss

Improve compatibility with additional mysql installations.

Paging and sorting for assets

Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py

ECOM-369 Reunited the missing line with the rest of the page elements an...

Some mysql debian packages do not grant mysql user as many permissions, and
we need to add them.

Logistration: Add CSRF cookie to combined login/registration form

Add CSRF check for login/registration views.

PLAT-75

ECOM-369 Reunited the missing line with the rest of the page elements and fixed an error with HTML5 validation override

Upgrade diff-cover

Remove over optimization which didn't work correctly

Fix spelling of complementary role

Clean up pep8 and pylint violations

ECOM-369 accessibility updates

Added story PLAT-293 to do it correctly.
This fixes TNL-764

Also fixes failing Python unit tests

Changing event suppression to signal suppression.

Code review changes.

Fix test and pylint.

pylint error.

Updating the test to verify the signal is fired.

Test for all analytics events

Import pylint error.

Pylint error

Logistration: Clean up redirect logic

Logistration: Remove extra viewport meta tag

Pylint: ignore TODO comments

Logistration: Redirect to a valid URL when cancelling third party auth

Feature flagged enrollment counts on instructor dashboard.

Final text review

Fix pylint violation.

Fix OAuth token login endpoint to set session user

ECOM-632 added asterix explanation footnote

Use factory file so JS used by studio_xblock_wrapper.html goes through RequireJS Optimizer

Prevent instructors from accidentally downgrading enrollment modes throu...

try importing the exact references we need rather than deferencing it fr...

avoid annonymous user from redirecting to survey form