add initial_state attribute to jsinput tag
Log CDN request timeout with level INFO.
Use data dir from course.
Remove import.
Careful identification of "dashboards"
set keyboard input focus to the e-mail field on the login screen
Update AUTHORS
Updating SciPy
Updating acceptance (lettuce) db cache
Simplify bok choy environments to inherit pipeline settings from common.py
Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"

This reverts commit 252038c37664f90d5967f93454a6f23a0938258e, reversing
changes made to 7caf8c53b1a32ded0da4a50429f397efb7ba1ffc.
Merge pull request #4293 from juananpe/getinputfocusonlogin

set keyboard input focus to the e-mail field on the login screen
LMS-11137 Course Action State Django models.
clone_course: Add fields parameter to support new display_name.
LMS-11016 Studio server-side for course_listing and course_rerun.

Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
Fix incorrect max upload file size on forums

The file size is calculated and displayed as a number of bytes, but was
being incorrectly labeled as 'K' [0].

The size is now correctly labeled as "bytes" and the sentence now begins
with a leading captial letter.

Impact: This has been broken on master since 2012 [1].

[0] https://github.com/edx/edx-platform/blob/master/lms/djangoapps/django_comment_client/settings.py#L4
[1] https://github.com/edx/edx-platform/commit/5d90366917c6e81513e26ea4cb8305df0f3e6d97
Fixup: Studio server-side - review comments.
Merge pull request #4578 from edx/ahodges/documentation/DOC754

Careful identification of "dashboards"
Merge pull request #4574 from edx/reruns/cms-server-side

Reruns/cms server side LMS-11016
Merge pull request #4382 from edx/oleg/cdn-log-level-fix

Log CDN request timeout with level INFO.